Open Build Service

Changes of Revision 12

php7.changes Changed

php7.spec Changed

@@ -120,7 +120,7 @@
 %if 0%{?suse_version} <= 1320
 BuildRequires:  libmcrypt-devel
 %endif
-BuildRequires:  libopenssl-devel
+BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtidy-devel
 BuildRequires:  libtiff-devel
@@ -307,44 +307,6 @@
 Bz2 compression is also supported with the bz2 extension loaded.
 
 
-%package -n apache2-mod_php7
-Summary:        PHP7 Module for Apache 2.0
-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}
-Supplements:    packageand(%{apache_mmn}:%{name})
-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 /usr/share/doc/packages/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
@@ -1192,7 +1154,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-fastcgi
 mkdir -p build-cli
@@ -1285,12 +1246,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 \
@@ -1464,21 +1419,15 @@
 }
 
 # do the actual installation
-Install apache2
-
-#need it for yast module
-mv %{buildroot}%{apache_libexecdir}/libphp7.so %{buildroot}%{apache_libexecdir}/mod_php7.so
 Install fastcgi
 Install cli
 Install fpm
 
 # 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
 
@@ -1522,7 +1471,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}/var/lib/%{pkg_name}
 # documentation
@@ -1580,24 +1528,6 @@
 cd %{buildroot}/%{peardir}
 patch -p0 < %{PATCH9}
 
-%post -n apache2-mod_php7
-#some distro versions does not have this tool.
-if  -x /usr/sbin/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 /usr/sbin/a2enmod ; then
-        if a2enmod -q php7; then
-            a2dismod php7
-        fi
-    fi
-fi
-
 %if %{with systemd}
 %pre fpm
 %service_add_pre php-fpm.service
@@ -1626,17 +1556,6 @@
 %{fillup_and_insserv -f php-fpm}
 %endif
 
-%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
@@ -1701,13 +1620,6 @@
 %{_unitdir}/php-fpm.service
 %endif
 
-%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
@@ -1841,9 +1753,8 @@
 %files odbc
 %defattr(644,root,root,755)
 %{extension_dir}/odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/*odbc.ini
 %{extension_dir}/pdo_odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/*pdo_odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*odbc.ini
 
 %files opcache
 %defattr(644,root,root,755)
@@ -1875,9 +1786,8 @@
 %files pgsql
 %defattr(644,root,root,755)
 %{extension_dir}/pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/*pgsql.ini
 %{extension_dir}/pdo_pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/*pdo_pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pgsql.ini
 
 %files posix
 %defattr(644,root,root,755)