Open Build Service

Changes of Revision 10

php7.changes Changed

php7.spec Changed

@@ -110,14 +110,14 @@
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel
-BuildRequires:  imap-devel
+BuildRequires:  imap-openssl_1_1-devel
 BuildRequires:  krb5-devel
 BuildRequires:  libapparmor-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libopenssl-devel
+BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtidy-devel
 BuildRequires:  libtiff-devel
@@ -289,42 +289,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
-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
@@ -1160,7 +1124,6 @@
 cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4
 
 # build directories for individual SAPIs
-mkdir -p build-apache2
 mkdir -p build-fpm
 mkdir -p build-embed
 mkdir -p build-fastcgi
@@ -1262,12 +1225,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 \
@@ -1434,7 +1391,6 @@
 }
 
 # do the actual installation
-Install apache2
 Install fastcgi
 Install cli
 Install fpm
@@ -1443,11 +1399,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
 
@@ -1491,7 +1445,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
@@ -1540,24 +1493,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
 
@@ -1573,17 +1508,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)
 %if 0%{?suse_version} > 1320
@@ -1655,13 +1579,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