[phpMyAdmin/el6] Move rm(1) calls from %install to %prep (#1121355 #c10)

[Robert Scheck]

commit 1cb5aa2a6920e5ea92da67c38161ef1b2522c4ea
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Sep 18 22:48:32 2014 +0200

    Move rm(1) calls from %install to %prep (#1121355 #c10)

 phpMyAdmin.spec |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)
---
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4c27ce2..6061f99 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,19 +1,19 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%define pkgname	phpMyAdmin
+%global pkgname	phpMyAdmin
 
 # If php-mcrypt is available, it should be preferred. Otherwise the pure
 # phpseclib alternative alternative can be used externally or internally.
-%define mcrypt	1
-%define seclib	0
+%global mcrypt	1
+%global seclib	0
 
 # Having below mentioned separate projects externally or only internally?
-%define gettext	1
-%define tcpdf	1
+%global gettext	1
+%global tcpdf	1
 
 Summary:	Handle the administration of MySQL over the World Wide Web
 Name:		phpMyAdmin
 Version:	4.0.10.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.phpmyadmin.net/
@@ -94,6 +94,25 @@ sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_pkgdocdir}/ChangeLog@" \
 %endif
     -i libraries/vendor_config.php
 
+# Remove bundled libraries
+%if 0%{?gettext}
+rm -rf libraries/php-gettext/
+%endif
+
+%if 0%{?tcpdf}
+rm -rf libraries/tcpdf/
+%endif
+
+%if 0%{?mcrypt}%{?seclib}
+rm -rf libraries/phpseclib/
+%endif
+
+# Remove sources of JavaScript library
+rm -rf js/jquery/src/
+
+# Remove files related to Flash file (*.swf)
+rm -f js/canvg/flashcanvas.{js,swf}
+
 %build
 
 %install
@@ -112,25 +131,6 @@ 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/
 
-# Remove bundled libraries
-%if 0%{?gettext}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/php-gettext/
-%endif
-
-%if 0%{?tcpdf}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/tcpdf/
-%endif
-
-%if 0%{?mcrypt}%{?seclib}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/phpseclib/
-%endif
-
-# Remove sources of JavaScript library
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/js/jquery/src/
-
-# Remove files related to Flash file (*.swf)
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/js/canvg/flashcanvas.{js,swf}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,6 +152,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RANDOM
 %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{pkgname}/config/
 
 %changelog
+* Wed Sep 17 2014 Robert Scheck <robert at fedoraproject.org> 4.0.10.3-2
+- Move rm(1) calls from %%install to %%prep (#1121355 #c10)
+
 * Tue Sep 16 2014 Robert Scheck <robert at fedoraproject.org> 4.0.10.3-1
 - Upgrade to 4.0.10.3 (#1141635)