[phpMyAdmin] Fix paths to changelog and license when doc dir is unversioned (#994036).

[Ville Skyttä]

commit 1abbe322b7350a21766bc993eb20db4cd25528e0
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Dec 12 20:33:50 2013 +0200

    Fix paths to changelog and license when doc dir is unversioned (#994036).
    
    - Fix source URL, use xz compressed tarball.

 .gitignore      |    2 +-
 phpMyAdmin.spec |   13 +++++++++----
 sources         |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 737a6c1..65797ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.?.*-all-languages.tar.bz2
+phpMyAdmin-3.?.*-all-languages.tar.*
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 9007456..398691c 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,14 +1,15 @@
 %define pkgname	phpMyAdmin
 %define gettext	1
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Summary:	Handle the administration of MySQL over the World Wide Web
 Name:		phpMyAdmin
 Version:	3.5.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.phpmyadmin.net/
-Source0:	http://downloads.sourceforge.net/sourceforge/%{pkgname}/%{pkgname}-%{version}-all-languages.tar.bz2
+Source0:	http://downloads.sourceforge.net/phpmyadmin/%{pkgname}-%{version}-all-languages.tar.xz
 Source1:	phpMyAdmin-config.inc.php
 Source2:	phpMyAdmin.htaccess
 %if 0%{?rhel} != 5
@@ -52,8 +53,8 @@ like displaying BLOB-data as image or download-link and much more...
 %setup -q -n %{pkgname}-%{version}-all-languages
 
 # Setup vendor config file
-sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/ChangeLog@" \
-    -e "/'LICENSE_FILE'/s at ./LICENSE@%{_datadir}/doc/%{name}-%{version}/LICENSE@" \
+sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_pkgdocdir}/ChangeLog@" \
+    -e "/'LICENSE_FILE'/s at ./LICENSE@%{_pkgdocdir}/LICENSE@" \
     -e "/'CONFIG_DIR'/s@'./'@'%{_sysconfdir}/%{pkgname}/'@" \
     -e "/'SETUP_CONFIG_FILE'/s at ./config/config.inc.php@%{_localstatedir}/lib/%{pkgname}/config/config.inc.php@" \
 %if %{gettext}
@@ -95,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/config
 
 %changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.5.8.2-2
+- Fix paths to changelog and license when doc dir is unversioned (#994036).
+- Fix source URL, use xz compressed tarball.
+
 * Wed Oct 09 2013 Paul Wouters <pwouters at redhat.com> - 3.5.8.2-1
 - Upgrade to 3.5.8.2 (Various security issues)
 
diff --git a/sources b/sources
index 071c277..c223819 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7aea31871defad0a2fe47f7a18f1d94  phpMyAdmin-3.5.8.2-all-languages.tar.bz2
+ea74a4a59588ccc15c528e214e7124f7  phpMyAdmin-3.5.8.2-all-languages.tar.xz