Accepting request 315601 from server:php:applications

1

OBS-URL: https://build.opensuse.org/request/show/315601
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=108
This commit is contained in:
Stephan Kulow 2015-07-12 20:53:21 +00:00 committed by Git OBS Bridge
commit b00393fec9
6 changed files with 7814 additions and 37 deletions

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de0bda676cd9d3ee7419f3d2868b75c1b4560b49aca9c8e5d7a9d6c74eb33355
size 7487782

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVml12AAoJEP78ZdGBr2RKnVAP/1yTqW5Swbm2Y3obdgHLbvBZ
UJ76HFnZxoMpNAeLuc51KC/L5nnq0QVdn00GNrxztBSIrgXCstVG649boIBuA2ue
7rVWpTmz+hQIAqONn98H8GdACsQWZNWXBMGnQOSZvKVzplFYSsf7wFnJ/rz6u5X3
pPGBw/rhOO76r1XzULDsph1bzUjYdy2EZoDRi1+zeTTpvdQKSU5zrMjMUyX86dIf
CwFJnqKNFH8DInNxzhLcov8KyP39OiZKwuo/R5MJBeXdYrg0T/Vmeky8AVNu+aZi
LpaVjYlCHaa6ZZBzCQqipeWFhWX7yuup3RFKpqXHHZmazphpBK2rHAywa7HDAXMz
RWOWYlPj8xpkzpooSjx692Ji+LkNqNKJR4xz0RdtfkMVoRSP5vkbJkpvcSJb3+sn
Cf7latsEz61onbAR2B9jRH+RfdFpAWdAwwIj2fWsrALtZhJ93gXBT4NxrkW0vjKk
h6zsbEQAlsObVmAgSoLcInU2NHK5Thikigi0PpdNUsP0g9emkrKP9jfLBlLINGDa
/MKQp15cKWIA2SkISv+vU34KExaDh8ezAAs54ke4tsJ627Qsl8OgrwrNr4vF0lhb
OuBx0nDel4kgxGPJjt8h4Lm8/iijtHlOR5GXlb7NiDX+ih0kW6BxJOGnfomXTEMT
+UA+D0tJR1GhUg/GWQrI
=mpUF
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Jul 8 06:27:42 UTC 2015 - ecsos@opensuse.org
- 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 - 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 Wed Jun 17 17:23:38 UTC 2015 - ecsos@opensuse.org

7738
phpMyAdmin.keyring Normal file

File diff suppressed because it is too large Load Diff

View File

@ -16,8 +16,6 @@
# #
Name: phpMyAdmin
%define apxs %{_sbindir}/apxs2 %define apxs %{_sbindir}/apxs2
%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR) %define ap_sysconfdir %(%{apxs} -q SYSCONFDIR)
%define ap_serverroot %(%{apxs} -q PREFIX) %define ap_serverroot %(%{apxs} -q PREFIX)
@ -30,28 +28,24 @@ Name: phpMyAdmin
%define ap_usr nobody %define ap_usr nobody
%define ap_grp nogroup %define ap_grp nogroup
%endif %endif
Name: phpMyAdmin
Version: 4.4.11
Release: 0
Summary: Administration of MySQL over the web Summary: Administration of MySQL over the web
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends Group: Productivity/Networking/Web/Frontends
Version: 4.4.10 Url: https://www.phpMyAdmin.net/
Release: 0 Source0: https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.bz2
Url: http://www.phpMyAdmin.net Source1: https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.bz2.asc
Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2 Source2: %{name}.keyring
Source1: %{name}.http Source3: %{name}.http
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Fix-SuSE: provide useful default config # Fix-SuSE: provide useful default config
Patch0: %{name}-config.patch Patch0: %{name}-config.patch
# Fix-SUSE: auto config for pma storage # Fix-SUSE: auto config for pma storage
Patch1: %{name}-pma.patch Patch1: %{name}-pma.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwgen coreutils sed grep
BuildRequires: apache2-devel BuildRequires: apache2-devel
BuildRequires: python-devel BuildRequires: python-devel
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
# #
Requires: mod_php_any Requires: mod_php_any
Requires: php-bz2 Requires: php-bz2
@ -62,7 +56,17 @@ Requires: php-mcrypt
Requires: php-mysql Requires: php-mysql
Requires: php-session Requires: php-session
Requires: php-zlib Requires: php-zlib
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: coreutils
PreReq: grep
PreReq: pwgen
PreReq: sed
Recommends: php5-zip Recommends: php5-zip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
%description %description
phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a
@ -103,7 +107,7 @@ Currently phpMyAdmin can:
%setup -q -n %{name}-%{version}-all-languages %setup -q -n %{name}-%{version}-all-languages
## rpmlint: ## rpmlint:
# wrong-file-end-of-line-encoding # 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 %patch0
%patch1 %patch1
@ -118,32 +122,32 @@ find . -type f -name '*.orig' -exec rm {} \;
%install %install
#%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name} #%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}
%{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} install -d -m0755 %{buildroot}%{ap_docroot}/%{name}
%{__cp} -dR *.css *.php *.ico js libraries locale themes \ cp -dR *.css *.php *.ico js libraries locale themes \
$RPM_BUILD_ROOT%{ap_docroot}/%{name} %{buildroot}%{ap_docroot}/%{name}
# install config to config dir # install config to config dir
%{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \ install -D -m0640 %{buildroot}%{ap_docroot}/%{name}/config.sample.inc.php \
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php %{buildroot}%{_sysconfdir}/%{name}/config.inc.php
# fix libraries/vendor_config.php # fix libraries/vendor_config.php
%{__sed} -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \ sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \
$RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/vendor_config.php %{buildroot}%{ap_docroot}/%{name}/libraries/vendor_config.php
# fix libraries/common.inc.php # fix libraries/common.inc.php
#%%{__sed} -i -e "s,@PMA_Config@,%%{_sysconfdir}/%%{name}/config.inc.php,g" \ #%%{__sed} -i -e "s,@PMA_Config@,%%{_sysconfdir}/%%{name}/config.inc.php,g" \
# $RPM_BUILD_ROOT%%{ap_docroot}/%%{name}/libraries/common.inc.php # $RPM_BUILD_ROOT%%{ap_docroot}/%%{name}/libraries/common.inc.php
# generate file list # generate file list
find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST find %{buildroot}%{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 find %{buildroot}%{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 %{SOURCE3} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
# 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" $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf -e "s,@docdir@,%{_docdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
# rpmlint stuff # rpmlint stuff
%if 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/libraries %fdupes %{buildroot}%{ap_docroot}/%{name}/libraries
%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes %fdupes %{buildroot}%{ap_docroot}/%{name}/themes
%endif %endif
# Fix python-bytecode-inconsistent-mtime # Fix python-bytecode-inconsistent-mtime
@ -156,7 +160,7 @@ popd
# on `rpm -ivh` PARAM is 1 # on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2 # on `rpm -Uvh` PARAM is 2
# set PmaAbsoluteUri ### generate blowfish secret # 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} -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
%if 0%{?suse_version} < 1310 %if 0%{?suse_version} < 1310
%restart_on_update apache2 %restart_on_update apache2
@ -171,9 +175,6 @@ popd
#systemctl try-restart apache2 &>/dev/null #systemctl try-restart apache2 &>/dev/null
%endif %endif
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%files -f FILELIST %files -f FILELIST
%defattr(644,root,root,755) %defattr(644,root,root,755)
%doc ChangeLog %doc ChangeLog