post-process generated poldek.conf

need to have some fields commented out, not as builtin defaults
in fact seems "ignore = vserver-packages" builtin does not work

diff --git a/poldek-config.patch b/poldek-config.patch
new file mode 100644 (file)
index 0000000..f89f304
--- /dev/null
+++ b/poldek-config.patch
@@ -0,0 +1,17 @@
+--- poldek-0.30.0/conf/poldek.conf     2013-07-08 14:19:35.294351501 +0300
++++ poldek-0.30.0/conf/poldek.conf     2013-07-08 14:06:38.722878665 +0300
+@@ -132,12 +132,11 @@
+ 
+ # Prevent package listed from being upgraded if they are already installed.
+ # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
+-#hold = 
++hold = kernel*
+ 
+ # Ignore package list - packages fits given mask will be invisible.
+ # ignore = *-smp-* foo*
+-# ignore = vserver-packages
+-#ignore = vserver-packages
++ignore = vserver-packages
+ 
+ # Conflicts with already installed packages are treated as resolved
+ # if at least one of multiple-installed package satisfies conflict.

diff --git a/poldek.spec b/poldek.spec
index 3a4ba0e5648a874935431d06f119770356934deb..95ee271ffc5cefbebaae0808cf25da926e04349d 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,13 +14,13 @@
 %define                ver_db_rel      3
 %define                ver_rpm         5.4.10
 
-%define                rel     2%{?with_snap:.%{SNAP}}
+%define                rel     3
 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
 Name:          poldek
 Version:       0.30.0
-Release:       %{rel}
+Release:       %{rel}%{?with_snap:.%{SNAP}}
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
@@ -40,6 +40,7 @@ Source101:    %{name}-multilib-snap.conf
 Source102:     %{name}-debuginfo-snap.conf
 Patch0:                %{name}-size-type.patch
 Patch1:                %{name}-Os-fail-workaround.patch
+Patch2:                %{name}-config.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf
@@ -204,6 +205,7 @@ Moduły języka Python dla poldka.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4