Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2015-07-12 22:53:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2015-06-23 11:56:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2015-07-12 22:53:23.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Jul 8 06:27:42 UTC 2015 - [email protected] + +- update to 4.4.11 (2015-07-06) + - fix bug Missing selected/entered values when editing active + options in visual query builder + - sf#4969 Autoload from prefs_storage not behaving properly + - sf#4972 Incorrect length computed for binary data + - fix bug Remove character set from create_tables_drizzle.sql + - sf#4973 Users overview needs clarification + - sf#4974 Creating a database from console doesn't update + navigation panel + - sf#4844 FAQ 1.17 needs an update +- change sourcepath in spec + +------------------------------------------------------------------- +Thu Jul 2 11:16:15 UTC 2015 - [email protected] + +- switch upstream url to https +- include signed release together with keyring to verify signatures + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.4.10-all-languages.tar.bz2 New: ---- phpMyAdmin-4.4.11-all-languages.tar.bz2 phpMyAdmin-4.4.11-all-languages.tar.bz2.asc phpMyAdmin.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.lBEVeM/_old 2015-07-12 22:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.lBEVeM/_new 2015-07-12 22:53:25.000000000 +0200 @@ -16,8 +16,6 @@ # -Name: phpMyAdmin - %define apxs %{_sbindir}/apxs2 %define ap_sysconfdir %(%{apxs} -q SYSCONFDIR) %define ap_serverroot %(%{apxs} -q PREFIX) @@ -30,28 +28,24 @@ %define ap_usr nobody %define ap_grp nogroup %endif - +Name: phpMyAdmin +Version: 4.4.11 +Release: 0 Summary: Administration of MySQL over the web 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/%{version}/%{name}-%{version}-all-languages.tar.bz2 +Source1: https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{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 # Fix-SUSE: auto config for pma storage Patch1: %{name}-pma.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: pwgen coreutils sed grep BuildRequires: apache2-devel BuildRequires: python-devel -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif # Requires: mod_php_any Requires: php-bz2 @@ -62,7 +56,17 @@ Requires: php-mysql Requires: php-session Requires: php-zlib +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: coreutils +PreReq: grep +PreReq: pwgen +PreReq: sed Recommends: php5-zip +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 @@ -103,7 +107,7 @@ %setup -q -n %{name}-%{version}-all-languages ## rpmlint: # wrong-file-end-of-line-encoding -%{__perl} -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php +perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php %patch0 %patch1 @@ -118,32 +122,32 @@ %install #%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name} -%{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} -%{__cp} -dR *.css *.php *.ico js libraries locale themes \ - $RPM_BUILD_ROOT%{ap_docroot}/%{name} +install -d -m0755 %{buildroot}%{ap_docroot}/%{name} +cp -dR *.css *.php *.ico js libraries locale themes \ + %{buildroot}%{ap_docroot}/%{name} # install config to config dir -%{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php +install -D -m0640 %{buildroot}%{ap_docroot}/%{name}/config.sample.inc.php \ + %{buildroot}%{_sysconfdir}/%{name}/config.inc.php # fix libraries/vendor_config.php -%{__sed} -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \ - $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/vendor_config.php +sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \ + %{buildroot}%{ap_docroot}/%{name}/libraries/vendor_config.php # fix libraries/common.inc.php #%%{__sed} -i -e "s,@PMA_Config@,%%{_sysconfdir}/%%{name}/config.inc.php,g" \ # $RPM_BUILD_ROOT%%{ap_docroot}/%%{name}/libraries/common.inc.php # 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 +find %{buildroot}%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST +find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST +install -D -m0644 %{SOURCE3} %{buildroot}%{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 +sed -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \ + -e "s,@docdir@,%{_docdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf # rpmlint stuff %if 0%{?suse_version} > 1020 -%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/libraries -%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes +%fdupes %{buildroot}%{ap_docroot}/%{name}/libraries +%fdupes %{buildroot}%{ap_docroot}/%{name}/themes %endif # Fix python-bytecode-inconsistent-mtime @@ -156,7 +160,7 @@ # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 # set PmaAbsoluteUri ### generate blowfish secret -%{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ +sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \ -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} %if 0%{?suse_version} < 1310 %restart_on_update apache2 @@ -171,9 +175,6 @@ #systemctl try-restart apache2 &>/dev/null %endif -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files -f FILELIST %defattr(644,root,root,755) %doc ChangeLog ++++++ phpMyAdmin-4.4.10-all-languages.tar.bz2 -> phpMyAdmin-4.4.11-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.4.10-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.4.11-all-languages.tar.bz2 differ: char 11, line 1
