- x32 rebuild

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 8d9540e05fe6fd454fa4a4c6eff2c34196ea26f8..9ed52c625a87ea3a8e4122a739d133797e7f696a 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -30,7 +30,7 @@
 %define                ver_rpm         5.4.10
 %endif
 
-%define                rel     2
+%define                rel     4
 Summary:       RPM packages management helper tool
 Summary(hu.UTF-8):     RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -407,50 +407,6 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%triggerpostun -- poldek < 0.19.0-1.20050613.22.0
-if [ -f /etc/poldek.conf.rpmsave ]; then
-       awk '/^source/ {
-       name = $3;
-       path = $4;
-       auto = "yes";
-       autoup = "yes";
-       type = "pdir";
-       pri = "";
-
-       if (sub(",noauto", "", name)) {
-               auto = "no";
-       }
-
-       # process pri=\d+
-       if (match(name, /,pri=[0-9]+/)) {
-               pri = substr(name, RSTART + 5, RLENGTH - 5);
-               name = substr(name, 1, RSTART - 1) substr(name, RSTART + RLENGTH);
-       }
-
-       # skip ac sources. already in new config.
-       if (name !~ /^ac(-(ready|test|supported|updates-(general|security)))?$/) {
-               print "";
-               print "[source]";
-               print "name = " name;
-               print "type = " type;
-               print "path = " path;
-               print "auto = " auto;
-               print "autoup = " autoup;
-               if (pri) {
-                       print "pri = " pri;
-               }
-       }
-
-       }' < /etc/poldek.conf.rpmsave >> /etc/poldek/source.conf
-       echo "Converted old custom sources from /etc/poldek.conf.rpmsave to new poldek format in /etc/poldek/source.conf"
-
-       # copy hold=
-       hold=$(grep ^hold /etc/poldek.conf.rpmsave)
-       if [ "$hold" ]; then
-               %{__sed} -i -e "/^#hold =/s/^.*/$hold/" /etc/poldek/poldek.conf
-       fi
-fi
-
 %triggerpostun -- poldek < 0.30-0.20080225.00.1
 if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then
        %{__sed} -i -e '/^%%include source.conf/{
@@ -464,25 +420,25 @@ fi
 %{__sed} -i -e '/%%include %%{_distro}-multilib-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf
 
 if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
-       cp -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
+       %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
+       %{__mv} -v %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
 fi
 
 %ifarch %{x8664}
 if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
-       cp -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+       %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
+       %{__mv} -v %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 fi
 %endif
 
 %triggerpostun -- poldek < 0.30.1-3
 if [ -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave ]; then
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf{,.rpmnew}
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf
+       %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf{,.rpmnew}
+       %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf
 fi
 if [ -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave ]; then
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf{,.rpmnew}
-       cp -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf
+       %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf{,.rpmnew}
+       %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf
 fi
 
 %files -f %{name}.lang