From ae8686af22109bd2ed8a8f3587e79209c7dbec0e Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 2 Dec 2020 19:43:29 +0100
Subject: [PATCH] - cleanup

---
 poldek-libdb.patch      | 43 ---------------------------
 poldek-python-fix.patch | 64 -----------------------------------------
 2 files changed, 107 deletions(-)
 delete mode 100644 poldek-libdb.patch
 delete mode 100644 poldek-python-fix.patch

diff --git a/poldek-libdb.patch b/poldek-libdb.patch
deleted file mode 100644
index 2533baf..0000000
--- a/poldek-libdb.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur poldek-0.30.1.orig/configure.ac poldek-0.30.1/configure.ac
---- poldek-0.30.1.orig/configure.ac	2014-03-26 19:23:01.000000000 +0000
-+++ poldek-0.30.1/configure.ac	2015-07-12 20:28:29.254107458 +0000
-@@ -299,35 +299,13 @@
- AC_CHECK_FUNCS(gzungetc)
- 
- DBLIB=""
--if test "${is_rpm4_0_4}." = "no." ; then
--	dnl tocheck: -ldb-3.1 causes link with static lib from /usr/lib
--	dnl instead shared one from /lib
--	#AC_CHECK_LIB(db-3.1, db_create, [DBLIB="-ldb-3.1"],
--	#  AC_CHECK_LIB(db-3.0, db_create, [DBLIB="-ldb-3.0"],
--	#    AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"])
--	#  )
--	#)
--	CPPFLAGS="-I/usr/include/db3 $CPPFLAGS"
--	
--	AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS])
--	# assume that librpm complied with --enable-db1
--	#if test "${ENABLE_STATIC}." = "yes."; then 
--	#	DBLIB="$DBLIB -ldb1"
--	#fi
--else
--    AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"],
--        [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"],
--             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"],
--                     [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])],
--                     [$LIBS])],, [$LIBS])],, [$LIBS])
-+AC_CHECK_LIB(db-4.7, db_create, [DBLIB="-ldb-4.7" DBINCLUDE="-I/usr/include/db4.7"],,[$LIBS])
- 
--	if test "${ENABLE_STATIC}." = "yes."; then 
--		DBLIB="$DBLIB"
--	fi
--
--	CPPFLAGS="$DBINCLUDE $CPPFLAGS"
-+if test "${ENABLE_STATIC}." = "yes."; then 
-+	DBLIB="$DBLIB"
- fi
- 
-+CPPFLAGS="$DBINCLUDE $CPPFLAGS"
- 
- AC_CHECK_LIB(popt, poptReadConfigFile)
- 
diff --git a/poldek-python-fix.patch b/poldek-python-fix.patch
deleted file mode 100644
index b961902..0000000
--- a/poldek-python-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urNpa poldek-0.32.2.orig/python/Makefile.am poldek-0.32.2/python/Makefile.am
---- poldek-0.32.2.orig/python/Makefile.am	2016-01-30 14:05:57.000000000 +0000
-+++ poldek-0.32.2/python/Makefile.am	2017-11-08 07:55:31.168941840 +0000
-@@ -3,8 +3,8 @@ py_ver     = $(shell python -c "import s
- py_prefix  = $(shell python -c "import sys; print sys.prefix")
- py_incdir  = $(py_prefix)/include/python$(py_ver)
- 
--EXTRA_DIST = poldekmod.i local_stdint.c pyldek.py run.sh
--CLEANFILES = wrap_* poldekmod.py local_stdint.h
-+EXTRA_DIST = poldekmod.i pyldek.py run.sh
-+CLEANFILES = wrap_* poldekmod.py
- 
- AM_CPPFLAGS = @TRURL_INCLUDE@ @TNDB_INCLUDE@ -I$(top_srcdir) -I$(py_incdir) -I.
- 
-@@ -21,16 +21,12 @@ AM_CFLAGS=
- CFLAGS=
- CPPFLAGS += -DSWIG -DPOCLIDEK_ITSELF 
- 
--poldekmod.i: local_stdint.h
--
--#install-exec-hook:
--#	$(mkinstalldirs) "$(DESTDIR)$(py_sitedir)"
-+install-exec-hook:
-+	$(mkinstalldirs) "$(DESTDIR)$(py_sitedir)"
-+	$(install_sh) .libs/_poldekmod.so "$(DESTDIR)$(py_sitedir)"
- 
- poldekmod.py: wrap_poldekmod.c
- 
--local_stdint.h: local_stdint.c
--	$(CPP) $< > $@
--
- #wrap_poldekmod.c: poldekmod.i
- #	$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I/usr/include -o $@ $<
- 
-diff -urNpa 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-11-08 07:55:31.169941840 +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 @@ static struct vf_progress vfPyProgress;
- %}
- 
- %include exception.i
--%include "local_stdint.h"
- %include "trurl/narray.h"
- %include "capreq.h"
- %include "pkg.h"
-diff -urNpa 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-11-08 07:55:53.362940517 +0000
-@@ -3065,7 +3065,6 @@ static swig_module_info swig_module = {s
- #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"
-- 
2.44.0