From: mis <mis@pld-linux.org>
Date: Sat, 7 Jun 2008 07:42:41 +0000 (+0000)
Subject: - fixed #158
X-Git-Tag: auto/th/poldek-0_30-0_20080604_13_2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpoldek.git;a=commitdiff_plain;h=f6aa3ebc022174479bfd13e9d0c38c94e7505bfc

- fixed #158

Changed files:
    poldek-158fix.patch -> 1.1
    poldek.spec -> 1.344
---

diff --git a/poldek-158fix.patch b/poldek-158fix.patch
new file mode 100644
index 0000000..530d438
--- /dev/null
+++ b/poldek-158fix.patch
@@ -0,0 +1,17 @@
+Index: install3/process.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/install3/process.c,v
+retrieving revision 1.5
+diff -u -r1.5 process.c
+--- install3/process.c	13 May 2008 16:25:09 -0000	1.5
++++ install3/process.c	7 Jun 2008 07:36:54 -0000
+@@ -61,6 +61,9 @@
+ {
+     int i;
+ 
++    if (i3_is_hand_marked(ictx, i3pkg->pkg))
++        return;
++
+     tracef(indent, "- rollbacking %s", pkg_id(i3pkg->pkg));
+     iset_remove(ictx->inset, i3pkg->pkg);
+     i3_forget_error(ictx, i3pkg->pkg);
diff --git a/poldek.spec b/poldek.spec
index 5887bb3..e72ed2c 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -15,7 +15,7 @@
 %define	ver_rpm	4.4.9-56
 #
 %define		snap	20080604.13
-%define		rel		1
+%define		rel		2
 Summary:	RPM packages management helper tool
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
@@ -36,6 +36,7 @@ Source7:	%{name}.png
 Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-abort-on-upgrade.patch
+Patch3:     %{name}-158fix.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -163,6 +164,7 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f