Open Build Service

Changes of Revision 11

php7.changes Changed

php7.spec Changed

@@ -25,10 +25,6 @@
 %define peardir           %{_datadir}/%{pkg_name}/PEAR
 %define php_sysconf       %{_sysconfdir}/%{pkg_name}
 %define build_firebird 0%{?is_opensuse}
-%define build_imap 0
-%if %{suse_version} <= 1315
-%define build_imap 1
-%endif
 %bcond_with make_test
 # as soon as suhosin is ported to php7, this with_suhosin and
 # related conditions can be removed entirely
@@ -104,9 +100,7 @@
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel
 BuildRequires:  gmp-devel
-%if %{build_imap}
-BuildRequires:  imap-devel
-%endif
+BuildRequires:  imap-openssl_1_1-devel
 BuildRequires:  krb5-devel
 BuildRequires:  libapparmor-devel
 BuildRequires:  libbz2-devel
@@ -114,7 +108,7 @@
 BuildRequires:  libevent-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libopenssl-devel
+BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtidy-devel
 BuildRequires:  libtiff-devel
@@ -134,7 +128,6 @@
 BuildRequires:  unixODBC-devel
 BuildRequires:  update-alternatives
 BuildRequires:  xz
-BuildRequires:  imap-devel
 BuildRequires:  pkgconfig(vpx)
 BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xpm)
@@ -279,43 +272,6 @@
 Gzip support is available if PHP has the zlib extension built-in orloaded.
 Bz2 compression is also supported with the bz2 extension loaded.
 
-%package -n apache2-mod_php7
-Summary:        PHP7 module for the Apache 2.x webserver
-Group:          Productivity/Networking/Web/Servers
-Requires:       %{apache_mmn}
-Requires:       %{name} = %{version}
-Requires:       apache2-prefork
-PreReq:         apache2
-Supplements:    packageand(%{apache_mmn}:%{name})
-Provides:       mod_php_any = %{version}
-Provides:       php-date = %{version}
-Provides:       php-date(vhng) = %{php_vhng_branch}
-Provides:       php-filter = %{version}
-Provides:       php-filter(vhng) = %{php_vhng_branch}
-Provides:       php-pcre = %{version}
-Provides:       php-pcre(vhng) = %{php_vhng_branch}
-Provides:       php-reflection = %{version}
-Provides:       php-reflection(vhng) = %{php_vhng_branch}
-Provides:       php-session = %{version}
-Provides:       php-session(vhng) = %{php_vhng_branch}
-Provides:       php-simplexml = %{version}
-Provides:       php-simplexml(vhng) = %{php_vhng_branch}
-Provides:       php-spl = %{version}
-Provides:       php-spl(vhng) = %{php_vhng_branch}
-Provides:       php-xml = %{version}
-Provides:       php-xml(vhng) = %{php_vhng_branch}
-Obsoletes:      apache2-mod_php5
-
-%description -n apache2-mod_php7
-PHP is a server-side, cross-platform HTML embedded scripting language.
-If you are completely new to PHP and want to get some idea of how it
-works, have a look at the Introductory tutorial. Once you get beyond
-that, have a look at the example archive sites and some of the other
-resources available in the links section.
-
-Please refer to %{_docdir}/php7/README.SUSE for
-information on how to load the module into the Apache webserver.
-
 %package fastcgi
 Summary:        FastCGI PHP7 Module
 Group:          Development/Libraries/PHP
@@ -612,7 +568,6 @@
 Unicode character set. Supported character sets depend on the iconv
 implementation of your system.
 
-%if %{build_imap}
 %package imap
 Summary:        IMAP protocol support for PHP
 Group:          Development/Libraries/PHP
@@ -624,7 +579,6 @@
 %description imap
 These functions enable you to operate with the IMAP protocol, as well
 as the NNTP, POP3 and local mailbox access methods.
-%endif
 
 %package intl
 Summary:        ICU integration for PHP
@@ -1089,18 +1043,6 @@
 functions which work with gzip-compressed files (and uncompressed
 files, too, but not with sockets).
 
-%package imap
-Summary:        IMAP protocol support for PHP
-Group:          Development/Libraries/PHP
-Requires:       %{name} = %{version}
-Provides:       php-imap = %{version}
-Provides:       php-imap(vhng) = %{php_vhng_branch}
-Obsoletes:      php5-imap
-
-%description imap
-These functions enable you to operate with the IMAP protocol, as well
-as the NNTP, POP3 and local mailbox access methods.
-
 %prep
 echo %{apache_mmn}
 %setup -q -n php-%{version} -a 1
@@ -1154,7 +1096,6 @@
 # Regenerate configure scripts (patches change config.m4's)
 touch configure.in
 # we build three SAPI
-mkdir -p build-apache2
 mkdir -p build-fpm
 mkdir -p build-embed
 mkdir -p build-fastcgi
@@ -1240,12 +1181,6 @@
 }
 
 # perform all builds
-# apache2 sapi
-Build apache2 \
-    --with-apxs2=%{apache_apxs} \
-    --disable-all \
-    --disable-cli
-
 # fast-cgi sapi
 Build fastcgi \
     --enable-force-cgi-redirect \
@@ -1307,10 +1242,8 @@
     --with-gettext=shared \
     --with-gmp=shared \
     --with-iconv=shared \
-%if %{build_imap}
     --with-imap=shared \
     --with-imap-ssl \
-%endif
     --with-kerberos \
     --enable-json=shared \
     --with-ldap=shared \
@@ -1406,8 +1339,6 @@
 }
 
 # do the actual installation
-Install apache2
-mv %{buildroot}%{apache_libexecdir}/libphp7.so %{buildroot}%{apache_libexecdir}/mod_php7.so
 Install fastcgi
 Install cli
 Install fpm
@@ -1416,11 +1347,9 @@
 
 # generate php.ini from php.ini-production:
 install -dm 755 %{buildroot}/%{php_sysconf}/conf.d
-install -dm 755 %{buildroot}/%{php_sysconf}/apache2
 install -dm 755 %{buildroot}/%{php_sysconf}/cli
 install -dm 755 %{buildroot}/%{php_sysconf}/fastcgi
 install -dm 755 %{buildroot}/%{php_sysconf}/fpm
-sed "s=@extdir@=%{extension_dir}=" php.ini-production > %{buildroot}/%{php_sysconf}/apache2/php.ini
 sed "s=@extdir@=%{extension_dir}=" php.ini-production | sed -r 's/^(html_errors|implicit_flush|max_execution_time|register_argc_argv)/;\1/' > %{buildroot}/%{php_sysconf}/cli/php.ini
 sed "s=@extdir@=%{extension_dir}=" php.ini-production > %{buildroot}/%{php_sysconf}/fastcgi/php.ini
 
@@ -1464,7 +1393,6 @@
 sed "s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules=" php-suse-addons/README.SUSE > README.SUSE
 # apache configuration
 mkdir -p %{buildroot}%{apache_sysconfdir}/conf.d
-install -m 644 php-suse-addons/sysconfig.apache2 %{buildroot}/%{apache_sysconfdir}/conf.d/%{pkg_name}.conf
 # directory for sessions
 install -d %{buildroot}%{_localstatedir}/lib/%{pkg_name}
 # documentation
@@ -1514,24 +1442,6 @@
 cd %{buildroot}/%{peardir}
 patch -p0 < %{PATCH9}
 
-%post -n apache2-mod_php7
-#some distro versions does not have this tool.
-if  -x %{_sbindir}/a2enmod ; then
-    if a2enmod -q php5 && ! a2enmod -q php7; then
-        a2dismod php5
-        a2enmod php7
-    fi
-fi
-
-%preun -n apache2-mod_php7
-if  "$1" = "0" ; then
-    if  -x %{_sbindir}/a2enmod ; then
-        if a2enmod -q php7; then
-            a2dismod php7
-        fi
-    fi
-fi
-
 %pre fpm
 %service_add_pre php-fpm.service
 
@@ -1547,17 +1457,6 @@
 %post embed -p /sbin/ldconfig
 %postun embed -p /sbin/ldconfig
 
-%postun -n apache2-mod_php7
-# request restart apache instanaces (which loaded php7) after apache2-mod_php7 package update
-if  $1 -eq 1 ; then
-  %apache_request_restart -m php7
-fi
-
-%posttrans -n apache2-mod_php7
-# restart apache instances which have this module after zypper or rpm transaction, if not
-# have restarted already in other posttrans
-%apache_restart_if_needed
-
 %files
 %defattr(-, root, root)
 %doc README* CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS UPGRADING
@@ -1624,13 +1523,6 @@
 %defattr(-, root, root)
 %{_libdir}/libphp7.so
 
-%files -n apache2-mod_php7
-%defattr(-,root,root)
-%{apache_libexecdir}/mod_php7.so
-%dir %{php_sysconf}/apache2
-%config(noreplace) %{php_sysconf}/apache2/php.ini
-%config(noreplace) %{apache_sysconfdir}/conf.d/%{pkg_name}.conf
-
 %files bcmath
 %defattr(644,root,root,755)
 %{extension_dir}/bcmath.so
@@ -1711,12 +1603,10 @@
 %{extension_dir}/iconv.so
 %config(noreplace) %{php_sysconf}/conf.d/*iconv.ini
 
-%if %{build_imap}
 %files imap
 %defattr(644,root,root,755)
 %{extension_dir}/imap.so
 %config(noreplace) %{php_sysconf}/conf.d/*imap.ini
-%endif
 
 %files intl
 %defattr(644,root,root,755)
@@ -1899,9 +1789,4 @@
 %{extension_dir}/zlib.so
 %config(noreplace) %{php_sysconf}/conf.d/*zlib.ini
 
-%files imap
-%defattr(644,root,root,755)
-%{extension_dir}/imap.so
-%config(noreplace) %{php_sysconf}/conf.d/*imap.ini
-
 %changelog