- merge from HEAD

Changed files:
    poldek.spec -> 1.315.2.4

diff --git a/poldek.spec b/poldek.spec
index c3133b62d1f58959c7a769a33725bb0a9b84f0f2..eb545ea01a54fac66b7d697a44b8cd65bcbffa82 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -7,7 +7,7 @@
 %define        ver_db  4.3.27-1
 %define        ver_rpm 4.4.9-1
 %define        snap    20080225.00
-%define        rel             0.3
+%define        rel             0.4
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
@@ -25,10 +25,15 @@ Source5:    %{name}.png
 Patch0:                %{name}-dirdeps.patch
 Patch1:                %{name}-vserver-packages.patch
 Patch2:                %{name}-config.patch
-Patch3:                %{name}-multilib.patch
+Patch3:                %{name}-nonoorder.patch
 Patch4:                %{name}-bug117hack.patch
 Patch5:                %{name}-missing-symbol.patch
 Patch6:                %{name}-abort-on-upgrade.patch
+Patch7:                %{name}-uninstall-greedy-fix.patch
+Patch8:                %{name}-pkguinf-kill-assert.patch
+Patch9:                %{name}-pkguinf-sourcerpm.patch
+Patch10:       %{name}-sigint_emit.patch
+Patch11:       %{name}-bug139.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -157,12 +162,15 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%ifarch %{x8664}
 %patch3 -p1
-%endif
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p0
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -222,12 +230,12 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
 
 sed -e '
        s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
+' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
 
 %ifarch %{x8664}
 sed '
        s|%%ARCH%%|%{_ftp_alt_arch}|g
-' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-multilib-source.conf
+' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
@@ -239,8 +247,8 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
-# get rid of non-pld sources
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
+# sources we don't package
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,pld,fedora,centos}-source.conf
 # include them in %doc
 rm -rf configs
 cp -a conf configs
@@ -309,12 +317,37 @@ if [ -f /etc/poldek.conf.rpmsave ]; then
        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/{
+               a
+               a# /etc/poldek/repos.d/*.conf
+               a%%includedir repos.d
+       }' %{_sysconfdir}/%{name}/poldek.conf
+fi
+
+%{__sed} -i -e '/%%include %%{_distro}-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf
+%{__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}
+       mv -f %{_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}
+       mv -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+fi
+%endif
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README* NEWS TODO configs/
+%doc README* NEWS TODO configs
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/*.conf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*
@@ -326,7 +359,7 @@ fi
 %{_pixmapsdir}/%{name}.png
 %endif
 
-%if !%{with static}
+%if %{without static}
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoclidek.so.*.*.*