From 547ba23d9d7f00eeb79a346855c111fd1861d391031e14137fee807c6a021e8e Mon Sep 17 00:00:00 2001
From: Javier Llorente <javier@opensuse.org>
Date: Wed, 11 Apr 2018 18:01:52 +0000
Subject: [PATCH] Accepting request 595754 from
 home:javierllorente:branches:server:php:applications

spec clean up (added another entry to changelog)

OBS-URL: https://build.opensuse.org/request/show/595754
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=312
---
 phpMyAdmin-rpmlintrc |  1 +
 phpMyAdmin.changes   | 16 ++++++++++++++++
 phpMyAdmin.spec      | 33 +++++++++++++++------------------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/phpMyAdmin-rpmlintrc b/phpMyAdmin-rpmlintrc
index 69d4bcb..95a7c8f 100644
--- a/phpMyAdmin-rpmlintrc
+++ b/phpMyAdmin-rpmlintrc
@@ -1,2 +1,3 @@
 addFilter("files-duplicated-waste")
 addFilter("files-duplicate")
+addFilter("pem-certificate")
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 0a7e5e4..6246961 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr 11 17:45:44 UTC 2018 - javier@opensuse.org
+
+- spec clean up
+  * Let rpm find the library dependencies by itself. Remove 
+    unneeded explicit Requires: tags (php-zlib)
+  * Remove logic for obsolete openSUSE releases
+  * Ignore pem-certificate rpmlint warning (see 
+    libraries/certs/README.rst)
+  * Remove hidden .github, .php_cs.dist, .scrutinizer.yml and
+    .editorconfig 
+  * Remove php_twig.h and twig.c (devel)
+  * Set proper shebang for bash and php scripts
+  * Make phpmyadmin/sql-parser/bin/*-query and
+    paragonie/random_compat/*.sh executable
+
 -------------------------------------------------------------------
 Wed Apr 11 07:42:57 UTC 2018 - javier@opensuse.org
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index ffe90df..4c244ac 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -59,7 +59,6 @@ Requires:       php-mbstring
 Requires:       php-mysql
 Requires:       php-openssl
 Requires:       php-session
-Requires:       php-zlib
 # FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         coreutils
 PreReq:         grep
@@ -73,9 +72,7 @@ Recommends:     php-zip
 Suggests:       php-mcrypt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-%if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
-%endif
 
 %description
 phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a
@@ -120,13 +117,21 @@ perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php
 %patch0
 %patch1
 
-find . -type d -exec chmod 755 {} \;
-find . -type f -exec chmod 644 {} \;
-rm -rf vendor/phpmyadmin/sql-parser/.github
-for file in *.orig .buildinfo .gitkeep .travis.yml .weblate .jshintrc .eslintrc.json ; do
+# clean up
+find . -name .github -type d -prune -exec rm -r {} \;
+for file in *.orig .buildinfo .gitkeep .travis.yml .weblate .jshintrc .eslintrc.json \
+.php_cs.dist .scrutinizer.yml .editorconfig php_twig.h twig.c; do
   find . -type f -name $file -delete
 done
 
+# set proper shebang
+sed -i 's/env php/php/' vendor/phpmyadmin/sql-parser/bin/*-query
+sed -i 's/env bash/bash/' vendor/paragonie/random_compat/*.sh
+
+# permissions
+find . -type d -exec chmod 755 {} \;
+find . ! -name '*.sh' ! -name '*-query' -type f -exec chmod 644 {} \;
+
 %build
 
 %install
@@ -155,10 +160,8 @@ 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
 
 # rpmlint stuff
-%if 0%{?suse_version} > 1020
 %fdupes %{buildroot}%{ap_docroot}/%{name}/libraries
 %fdupes %{buildroot}%{ap_docroot}/%{name}/themes
-%endif
 
 %post
 # on `rpm -ivh` PARAM is 1
@@ -175,18 +178,10 @@ if [ -x /usr/sbin/a2enmod ]; then
     a2enmod -q "php${php_version}" || a2enmod "php${php_version}"
   fi
 fi
-%if 0%{?suse_version} < 1310
-%restart_on_update apache2
-#%%else
 #systemctl try-restart apache2 &>/dev/null
-%endif
 
-%postun
-%if 0%{?suse_version} < 1310
-%restart_on_update apache2
-#%%else
+#%%postun
 #systemctl try-restart apache2 &>/dev/null
-%endif
 
 %files -f FILELIST
 %defattr(644,root,root,755)
@@ -198,5 +193,7 @@ fi
 %dir %{ap_docroot}/%{name}
 %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf
 %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.inc
+%attr (755,root,root) %{ap_docroot}/%{name}/vendor/phpmyadmin/sql-parser/bin/*-query
+%attr (755,root,root) %{ap_docroot}/%{name}/vendor/paragonie/random_compat/*.sh
 
 %changelog