Accepting request 314841 from home:Nijel:branches:server:php:applications

- switch upstream url to https
- include signed release together with keyring to verify signatures

OBS-URL: https://build.opensuse.org/request/show/314841
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=219

phpMyAdmin-4.4.10-all-languages.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdaa1c007981920d9fa19a3ffc7cdd55c4904aa4ab9a482c95fd19ea5631fbb7
-size 7480832
+oid sha256:26783c1f4474c390341675dcdee5e397b2b1cd0c0187fd674e8393dba7d50a60
+size 7495323

phpMyAdmin-4.4.10-all-languages.tar.bz2.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVhCLsAAoJEP78ZdGBr2RKQvcP/i6u+iMxM7nFn1+ysr6dXHuw
+MTb1k8Es0e2JZN+F0K7y5CRfNK4HhcsB6fPXyJmlmlhYTbfd2sm/M9m7FDfOF771
+EKk5lmaUw2KIlXew4XU/gARPKsKAftiq3PUT2oi3TvIVf4vBLavlYcYHBZP1UGqd
+MXvLQI8UJE8ot4uvcJ0uLMjtMu145Gm1HP8fxG4vZxj2Nk43k8w5Ub1PbNvuaIWb
+0qacJi7JwZGaDiURuJI7gG0ThwKE/J7LXkv2yrn/wExjnm4HoCeumJ6X6NSLBFOH
+YEOWFHSw+vF/FGJ3zKVBBMI3Vu2AcMIK2D1bCrfzgHbJ8jkZ1Jy9kJjVoH6vdpE4
+65eYrWnwr5ywIM9201bORdegktPI3ciuTkvUi7x6cKiaQFxZexvAWemem9bEXOJ4
+6N5DdXJr7D72L6twrBfY2QpYZ3DhAgDYXge0PDuFU2wbqmxROQfhtaPe6FIiLc5f
+D9+FsCZRwt0V1piRJjWve64VgRYhBHrKcS3j9a967Tu1DFAirMkz7igDr06HXuy2
+uiJnXOWV9dCHY26RxV52blPoWqXMxg7rx6Og9jc+WHh8LTt6C7zT55yCvohohCex
+c+rTPpYul/KLwSr1uWhN+eo7IELpn18UhGdxmWaBS3+n0pKV4PHSr26iLz5vPDZa
+roPgr8VvVdhs9V20c8gv
+=yS1y
+-----END PGP SIGNATURE-----

phpMyAdmin.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  2 11:16:15 UTC 2015 - mcihar@suse.cz
+
+- switch upstream url to https
+- include signed release together with keyring to verify signatures
+
 -------------------------------------------------------------------
 Wed Jun 17 17:23:38 UTC 2015 - ecsos@opensuse.org
 

phpMyAdmin.spec

@@ -36,9 +36,11 @@ License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
 Version:        4.4.10
 Release:        0
-Url:            http://www.phpMyAdmin.net
-Source0:        http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2
-Source1:        %{name}.http
+Url:            https://www.phpMyAdmin.net/
+Source0:        https://files.phpmyadmin.net/phpMyAdmin/4.4.10/%{name}-%{version}-all-languages.tar.bz2
+Source1:        https://files.phpmyadmin.net/phpMyAdmin/4.4.10/%{name}-%{version}-all-languages.tar.bz2.asc
+Source2:        %{name}.keyring
+Source3:        %{name}.http
 Source100:      %{name}-rpmlintrc
 # Fix-SuSE: provide useful default config
 Patch0:         %{name}-config.patch
@@ -135,7 +137,7 @@ find . -type f -name '*.orig' -exec rm {} \;
 # generate file list
 find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST
 find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST
-%{__install} -D -m0644 %{S:1} $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf
+%{__install} -D -m0644 %{S:3} $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf
 # fix paths in http config
 %{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
  -e "s,@docdir@,%{_docdir},g" $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf