pool/phpPgAdmin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 852497 from home:pgajdos

Browse Source 
- use system apache rpm macros

OBS-URL: https://build.opensuse.org/request/show/852497
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpPgAdmin?expand=0&rev=28
This commit is contained in:
Arjen de Korte 2020-12-10 07:46:35 +00:00 committed by Git OBS Bridge
parent b5eaee07ca
commit 00be96b7af
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpPgAdmin.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 1 15:04:30 UTC 2020 - pgajdos@suse.com
- use system apache rpm macros
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jun 20 22:13:04 UTC 2020 - chris@computersalat.de Sat Jun 20 22:13:04 UTC 2020 - chris@computersalat.de

28
phpPgAdmin.spec
View File

@ -19,10 +19,7 @@
Name: phpPgAdmin Name: phpPgAdmin
%define lc_name phppgadmin %define lc_name phppgadmin
%define apxs %{_sbindir}/apxs2 %define ap_docroot_old %{apache_serverroot}/htdocs
%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR)
%define ap_serverroot %(%{apxs} -q PREFIX)
%define ap_docroot_old %(%{apxs} -q PREFIX)/htdocs
%define ap_docroot %{_datadir} %define ap_docroot %{_datadir}
%define ppa_config %{_sysconfdir}/%{name}/config.inc.php %define ppa_config %{_sysconfdir}/%{name}/config.inc.php
@ -39,7 +36,8 @@ Source2: %{name}.http.inc
Patch0: %{name}-config.inc.patch Patch0: %{name}-config.inc.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: apache2-devel BuildRequires: apache-rpm-macros
BuildRequires: apache2
BuildRequires: fdupes BuildRequires: fdupes
Requires: mod_php_any Requires: mod_php_any
Requires: php >= 7.1 Requires: php >= 7.1
@ -98,12 +96,12 @@ find %{buildroot}%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | grep -v
find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php-dist' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php-dist' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST
# install config for apache # install config for apache
%{__install} -D -m0644 %{S:1} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf %{__install} -D -m0644 %{S:1} %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.conf
%{__install} -D -m0644 %{S:2} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.inc %{__install} -D -m0644 %{S:2} %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.inc
# fix paths in http config # fix paths in http config
%{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \ %{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
-e "s,@docdir@,%{_docdir},g" -e "s,@ap_sysconfdir@,%{ap_sysconfdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf -e "s,@docdir@,%{_docdir},g" -e "s,@ap_sysconfdir@,%{apache_sysconfdir},g" %{buildroot}%{apache_sysconfdir}/conf.d/%{name}.conf
# rpmlint stuff # rpmlint stuff
%fdupes %{buildroot}%{ap_docroot}/%{name} %fdupes %{buildroot}%{ap_docroot}/%{name}
@ -121,13 +119,13 @@ fi
# If someone did 'manually' change the config file it won't be replaced by rpm # If someone did 'manually' change the config file it won't be replaced by rpm
# Hence we backup the existing and place the new one # Hence we backup the existing and place the new one
find=0 find=0
find=$(grep -cw %{ap_sysconfdir}/conf.d/%{name}.conf -e "%{ap_docroot_old}/%{name}") || : find=$(grep -cw %{apache_sysconfdir}/conf.d/%{name}.conf -e "%{ap_docroot_old}/%{name}") || :
if [ $find -gt 0 ]; then if [ $find -gt 0 ]; then
ap_date="$(date '+%Y%m%d-%H%M')" ap_date="$(date '+%Y%m%d-%H%M')"
echo "creating backup of %{ap_sysconfdir}/conf.d/%{name}.conf to %{ap_sysconfdir}/conf.d/%{name}.conf.backup-${ap_date}" echo "creating backup of %{apache_sysconfdir}/conf.d/%{name}.conf to %{apache_sysconfdir}/conf.d/%{name}.conf.backup-${ap_date}"
cp -a %{ap_sysconfdir}/conf.d/%{name}.conf %{ap_sysconfdir}/conf.d/%{name}.conf.backup-${ap_date} cp -a %{apache_sysconfdir}/conf.d/%{name}.conf %{apache_sysconfdir}/conf.d/%{name}.conf.backup-${ap_date}
echo "copying %{ap_sysconfdir}/conf.d/%{name}.conf.rpmnew to %{ap_sysconfdir}/conf.d/%{name}.conf" echo "copying %{apache_sysconfdir}/conf.d/%{name}.conf.rpmnew to %{apache_sysconfdir}/conf.d/%{name}.conf"
cp -a %{ap_sysconfdir}/conf.d/%{name}.conf.rpmnew %{ap_sysconfdir}/conf.d/%{name}.conf cp -a %{apache_sysconfdir}/conf.d/%{name}.conf.rpmnew %{apache_sysconfdir}/conf.d/%{name}.conf
fi fi
%restart_on_update apache2 %restart_on_update apache2
@ -150,8 +148,8 @@ fi
%doc CREDITS DEVELOPERS FAQ HISTORY TODO TRANSLATORS %doc CREDITS DEVELOPERS FAQ HISTORY TODO TRANSLATORS
%license LICENSE %license LICENSE
%dir %{ap_docroot}/%{name} %dir %{ap_docroot}/%{name}
%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf %config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf
%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.inc %config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.inc
%dir %attr(0750,wwwrun,root) %{_sysconfdir}/%{name} %dir %attr(0750,wwwrun,root) %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,root,www) %{ppa_config} %config(noreplace) %attr(0640,root,www) %{ppa_config}