robert pushed to phpMyAdmin (f21). "- Upgrade to 4.4.1.1 (#1208320) (..more)"

[notifications at fedoraproject.org]

>From 989fa1591dcdd3607378360c4f34bda78b7f449b Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Fri, 10 Apr 2015 16:47:25 +0200
Subject: - Upgrade to 4.4.1.1 (#1208320) - Upgrade to 4.4.0 (thanks to Remi
 Collet)


diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 1441374..7469f8d 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -17,10 +17,12 @@
 
 Summary:	Handle the administration of MySQL over the World Wide Web
 Name:		phpMyAdmin
-Version:	4.3.13
+Version:	4.4.1.1
 Release:	1%{?dist}
-# MIT (js/jquery/, js/canvg/, js/codemirror/), GPLv2+ (the rest)
-License:	GPLv2+ and MIT
+# MIT (js/jquery/, js/canvg/, js/codemirror/, libraries/sql-formatter/),
+# BSD (libraries/plugins/auth/recaptcha/),
+# GPLv2+ (the rest)
+License:	GPLv2+ and MIT and BSD
 Group:		Applications/Internet
 URL:		http://www.phpmyadmin.net/
 Source0:	http://downloads.sourceforge.net/phpmyadmin/%{pkgname}-%{version}-all-languages.tar.xz
@@ -41,15 +43,17 @@ Requires:	nginx-filesystem
 Requires:	httpd-filesystem
 Requires:	php(httpd)
 %endif
-Requires:	webserver, php-bz2, php-ctype, php-curl, php-date, php-gd >= 5.3.0, php-hash, php-iconv
-Requires:	php-json, php-libxml, php-mbstring >= 5.3.0, php-mysql >= 5.3.0, php-mysqli, php-openssl
-Requires:	php-pcre, php-session, php-simplexml, php-spl, php-zip, php-zlib
+Requires:	webserver, php-bz2, php-ctype, php-curl, php-date, php-gd >= 5.3.0, php-iconv
+Requires:	php-json, php-libxml, php-mbstring >= 5.3.0, php-mysql >= 5.3.0, php-mysqli
+Requires:	php-openssl, php-pcre, php-session, php-simplexml, php-spl, php-zip, php-zlib
 %if 0%{?gettext}
 Requires:	php-php-gettext
 %endif
 # Optional runtime requirements for tcpdf: php-openssl, php-tidy (usually not required in phpMyAdmin)
 %if 0%{?tcpdf}
 Requires:	php-tcpdf, php-tcpdf-dejavu-sans-fonts
+%else
+Requires:	php-hash, php-xml >= 5.3.0
 %endif
 %if 0%{?rhel} == 5
 Provides:	phpMyAdmin = %{version}-%{release}, phpMyAdmin3 = %{version}-%{release}
@@ -127,17 +131,20 @@ install -Dpm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/%{pkg
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/{[CDLR]*,*.txt,config.sample.inc.php}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/doc/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/{doc,examples}/
 rm -f doc/html/.buildinfo
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/doc/
 ln -s ../../../..%{_pkgdocdir}/html/ $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/doc/html
+mv -f config.sample.inc.php examples/
 
-mv js/jquery/MIT-LICENSE.txt   LICENSE-jquery
-mv js/canvg/MIT-LICENSE.txt    LICENSE-canvg
-mv js/codemirror/LICENSE       LICENSE-codemirror
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/js/jquery/MIT-LICENSE.txt LICENSE-jquery
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/js/canvg/MIT-LICENSE.txt LICENSE-canvg
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/js/codemirror/LICENSE LICENSE-codemirror
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/plugins/auth/recaptcha/LICENSE LICENSE-recaptcha
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/sql-formatter/LICENSE.txt LICENSE-sql-formatter
 %if ! 0%{?tcpdf}
-mv libraries/tcpdf/LICENSE.TXT LICENSE-tcpdf
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/tcpdf/LICENSE.TXT LICENSE-tcpdf
 %endif
 
 %clean
@@ -152,7 +159,7 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RANDOM
 %defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE*
-%doc ChangeLog README DCO doc/html/ config.sample.inc.php
+%doc ChangeLog README DCO doc/html/ examples/
 %{_datadir}/%{pkgname}/
 %dir %attr(0750,root,apache) %{_sysconfdir}/%{pkgname}/
 %config(noreplace) %attr(0640,root,apache) %{_sysconfdir}/%{pkgname}/config.inc.php
@@ -166,6 +173,12 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RANDOM
 %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{pkgname}/config/
 
 %changelog
+* Fri Apr 10 2015 Robert Scheck <robert at fedoraproject.org> 4.4.1.1-1
+- Upgrade to 4.4.1.1 (#1208320)
+
+- Mon Apr 06 2015 Robert Scheck <robert at fedoraproject.org> 4.4.0-1
+- Upgrade to 4.4.0 (thanks to Remi Collet)
+
 * Mon Mar 30 2015 Robert Scheck <robert at fedoraproject.org> 4.3.13-1
 - Upgrade to 4.3.13
 
diff --git a/sources b/sources
index 9da82b0..96c4ad0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7ced29d189900c38193edff8b828e32  phpMyAdmin-4.3.13-all-languages.tar.xz
+4ef51a225ffb444ae4043c47ed942b7b  phpMyAdmin-4.4.1.1-all-languages.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/phpMyAdmin.git/commit/?h=f21&id=989fa1591dcdd3607378360c4f34bda78b7f449b