From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 31 Mar 2017 06:41:43 +0000 (+0000)
Subject: - workaround conflicting types with glibc 2.25 by removing use of local_stdint.h
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=af6bf1ff56785ce662b6b23007ab5596acddef70;p=packages%2Fpoldek.git

- workaround conflicting types with glibc 2.25 by removing use of local_stdint.h
---

diff --git a/poldek-no_local_stdint.patch b/poldek-no_local_stdint.patch
new file mode 100644
index 0000000..c8955f6
--- /dev/null
+++ b/poldek-no_local_stdint.patch
@@ -0,0 +1,30 @@
+diff -ur poldek-0.32.2.orig/python/poldekmod.i poldek-0.32.2/python/poldekmod.i
+--- poldek-0.32.2.orig/python/poldekmod.i	2016-01-30 14:05:57.000000000 +0000
++++ poldek-0.32.2/python/poldekmod.i	2017-03-31 06:38:56.158927742 +0000
+@@ -1,7 +1,6 @@
+ %module poldekmod
+ 
+ %{
+-#include "local_stdint.h"
+ #include "poldek.h"
+ #include "trurl/narray.h"
+ #include "trurl/nhash.h"
+@@ -33,7 +32,6 @@
+ %}
+ 
+ %include exception.i
+-%include "local_stdint.h"
+ %include "trurl/narray.h"
+ %include "capreq.h"
+ %include "pkg.h"
+diff -ur poldek-0.32.2.orig/python/wrap_poldekmod.c poldek-0.32.2/python/wrap_poldekmod.c
+--- poldek-0.32.2.orig/python/wrap_poldekmod.c	2016-07-18 18:00:08.000000000 +0000
++++ poldek-0.32.2/python/wrap_poldekmod.c	2017-03-31 06:39:00.925928082 +0000
+@@ -3065,7 +3065,6 @@
+ #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+ 
+ 
+-#include "local_stdint.h"
+ #include "poldek.h"
+ #include "trurl/narray.h"
+ #include "trurl/nhash.h"
diff --git a/poldek.spec b/poldek.spec
index c66b19b..22af5d2 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,7 +14,7 @@
 %define		ver_db_rel	1
 %define		ver_rpm		4.5-49
 
-%define		rel	1
+%define		rel	2
 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
@@ -35,6 +35,7 @@ Patch0:		%{name}-size-type.patch
 Patch1:		%{name}-config.patch
 Patch2:		pm-hooks.patch
 Patch3:		WTERMSIG.patch
+Patch4:		%{name}-no_local_stdint.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
@@ -199,6 +200,7 @@ Moduły języka Python dla poldka.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4