[packages/poldek] Add patch to fix rpmvercmp on rpm that supports tilde in version

megabajt megabajt at pld-linux.org
Wed Mar 20 00:27:01 CET 2013


commit e6f69ef123b0d9631d9fa5d25b86d99725fef982
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Wed Mar 20 00:22:05 2013 +0100

    Add patch to fix rpmvercmp on rpm that supports tilde in version

 poldek-git.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 poldek.spec      |  4 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index a3a1228..c8fcf48 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -15,7 +15,7 @@
 %define		ver_rpm		5.4.10
 
 %define		snap	rc7
-%define		rel	1%{?with_snap:.%{SNAP}}
+%define		rel	2%{?with_snap:.%{SNAP}}
 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
@@ -43,6 +43,7 @@ Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-size-type.patch
 Patch3:		%{name}-Os-fail-workaround.patch
+Patch4:		%{name}-git.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -205,6 +206,7 @@ Moduły języka Python dla poldka.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
diff --git a/poldek-git.patch b/poldek-git.patch
new file mode 100644
index 0000000..44c4125
--- /dev/null
+++ b/poldek-git.patch
@@ -0,0 +1,41 @@
+commit 9ecd484cd077adba94649b83b3f3bfd639644056
+Author: Marcin Banasiak <marcin.banasiak at gmail.com>
+Date:   Wed Mar 20 00:09:57 2013 +0100
+
+    rpmvercmp: read macro configuration files before using rpmEVRparse()
+
+diff --git a/pm/rpm/rpmvercmp.c b/pm/rpm/rpmvercmp.c
+index 968489a..d83f26b 100644
+--- a/pm/rpm/rpmvercmp.c
++++ b/pm/rpm/rpmvercmp.c
+@@ -1,6 +1,6 @@
+ /*
+   Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
+-  Copyright (C) 2010 - 2012 Marcin Banasiak <marcin.banasiak at gmail.com>
++  Copyright (C) 2010 - 2013 Marcin Banasiak <marcin.banasiak at gmail.com>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2 as
+@@ -20,7 +20,10 @@
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_RPM_5
++# include <rpm/rpmrc.h>
+ # include <rpm/rpmtag.h>
++#else
++# include <rpm/rpmlib.h>
+ #endif
+ 
+ #define _RPMEVR_INTERNAL
+@@ -61,6 +64,11 @@ int main(int argc, char *argv[])
+         exit(1);
+     }
+ 
++    if (rpmReadConfigFiles(NULL, NULL) < 0) {
++	fprintf(stderr, "Failed to read configuration files\n");
++	exit(2);
++    }
++
+     evr1 = malloc(sizeof(struct EVR_s));
+     evr2 = malloc(sizeof(struct EVR_s));
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/e6f69ef123b0d9631d9fa5d25b86d99725fef982



More information about the pld-cvs-commit mailing list