[packages/phpMyAdmin/v4.0.x: 18/18] Merge branch 'master' into v4.0.x

[glen]

commit 1dca87bba1c97244c4fa8c13ee9ddc767b2d8312
Merge: 3262b77 802c403
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jul 24 13:10:07 2015 +0300

    Merge branch 'master' into v4.0.x

 phpMyAdmin-apache.conf => apache.conf | 13 ++++++++++--
 phpMyAdmin-httpd.conf                 |  8 --------
 phpMyAdmin.spec                       | 37 +++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 25 deletions(-)
---
diff --cc phpMyAdmin.spec
index 8b3d2c8,c2d1bfa..18853f3
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@@ -4,8 -4,8 +4,8 @@@
  Summary:	phpMyAdmin - web-based MySQL administration
  Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
  Name:		phpMyAdmin
 -Version:	4.4.12
 -Release:	1
 +Version:	4.0.10.10
- Release:	1
++Release:	0.2
  License:	GPL v2
  Group:		Applications/Databases/Interfaces
  Source0:	https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.xz
@@@ -64,11 -64,8 +62,11 @@@ manual. Currently phpMyAdmin can
  - check referencial integrity
  - create complex queries automatically connecting required tables
  - create PDF graphics of your database layout
- - communicate in more than 50 different languages
+ - communicate in more than 72 different languages
  
 +This is older version compatible with PHP 5.2 and MySQL 5. Supported
 +for security fixes only, until Jan 1, 2017.
 +
  %description -l pl.UTF-8
  phpMyAdmin potrafi zarządzać całymi bazami MySQL (potrzebne
  uprawnienia superużytkownika) jak i pojedynczymi bazami danych.
@@@ -92,20 -89,30 +90,29 @@@ podręcznika MySQL). Aktualnie phpMyAdm
  %patch1 -p0
  %patch2 -p0
  
+ # cleanup backups after patching
+ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+ 
+ # github stuff
 -%{__rm} .coveralls.yml .scrutinizer.yml composer.json phpunit.xml*
++%{__rm} composer.json phpunit.xml*
+ 
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
--
- cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
- cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
+ cp -a . $RPM_BUILD_ROOT%{_appdir}
  
  cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
- ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
+ ln -s %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
  
  cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
- cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
  cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
  
+ # packaged as doc
 -%{__rm} $RPM_BUILD_ROOT%{_appdir}/{CONTRIBUTING.md,ChangeLog,DCO,LICENSE,README,RELEASE-DATE-*}
++%{__rm} $RPM_BUILD_ROOT%{_appdir}/{ChangeLog,LICENSE,README,RELEASE-DATE-*}
+ # cleanup not packaged stuff
 -%{__rm} -r $RPM_BUILD_ROOT%{_appdir}/{doc,examples,setup,sql}
++%{__rm} -r $RPM_BUILD_ROOT%{_appdir}/{doc,examples,setup}
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@@ -129,7 -136,7 +136,7 @@@
  
  %files
  %defattr(644,root,root,755)
- %doc ChangeLog README
 -%doc CONTRIBUTING.md ChangeLog DCO LICENSE README examples/
++%doc ChangeLog LICENSE README examples/
  %dir %attr(750,root,http) %{_sysconfdir}
  %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
  %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpMyAdmin.git/commitdiff/1dca87bba1c97244c4fa8c13ee9ddc767b2d8312