- fix pythom module building

Changed files:
    rpm-python-fix.patch -> 1.1
    rpm-system_libs.patch -> 1.5

diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch
new file mode 100644 (file)
index 0000000..80036c3
--- /dev/null
+++ b/rpm-python-fix.patch
@@ -0,0 +1,66 @@
+--- rpm-4.2/python/Makefile.am.wiget   Wed Jan  8 23:33:12 2003
++++ rpm-4.2/python/Makefile.am Thu Apr  3 15:52:29 2003
+@@ -28,45 +28,36 @@
+       rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
+ 
+ mylibs= \
+-      $(top_builddir)/lib/.libs/librpm.so \
+-      $(top_builddir)/rpmdb/.libs/librpmdb.so \
+-      $(top_builddir)/rpmio/.libs/librpmio.so \
+-      $(top_builddir)/popt/.libs/libpopt.so \
++      $(top_builddir)/lib/librpm.la \
++      $(top_builddir)/rpmdb/librpmdb.la \
++      $(top_builddir)/rpmio/librpmio.la \
++      -lpopt \
+       @WITH_LIBELF_LIB@
+ 
+ LDADD =
+ 
+ pythondir = $(pylibdir)/site-packages
+-python_PROGRAMS = rpmmodule.so
+ 
+ rpmdbdir = $(pylibdir)/site-packages/rpmdb
+-rpmdb_PROGRAMS = _rpmdb.so
++rpmdb_LTLIBRARIES = _rpmdb.la
+ 
+-noinst_PROGRAMS = poptmodule.so
++rpmmodule_la_SOURCES =
++rpmmodule_la_LIBADD = $(mylibs) $(LIBS) 
++rpmmodule_la_LDFLAGS = -module -avoid-version
++
++_rpmdb_la_SOURCES = _rpmdb.c
++_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
++_rpmdb_la_LDFLAGS = -module -avoid-version
++
++poptmodule_la_SOURCES = poptmodule.c
++poptmodule_la_LIBADD = $(mylibs) $(LIBS)
++poptmodule_la_LDFLAGS = -module -avoid-version
+ 
+-rpmmodule_so_SOURCES =
+-rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
+-
+-_rpmdb_so_SOURCES = _rpmdb.c
+-_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
+-
+-poptmodule_so_SOURCES = poptmodule.c
+-poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
+-
+-noinst_LTLIBRARIES = librpmmodule.la
+-librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
++python_LTLIBRARIES = rpmmodule.la poptmodule.la
++rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
+       rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
+       rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
+ 
+-rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
+-      $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+-
+-_rpmdb.so$(EXEEXT): _rpmdb.lo
+-      $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
+-
+-poptmodule.so$(EXEEXT): poptmodule.lo
+-      $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
+-
+ # rpmmodule.c header-py.c \
+ #     rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
+ #     rpmrc-py.c rpmte-py.c rpmts-py.c

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
index 96451bcb840a000c84aa285432f746fe66065f15..8e8463cd1c628c52bcffc26714952971fb6b895d 100644 (file)
--- a/rpm-system_libs.patch
+++ b/rpm-system_libs.patch
@@ -43,64 +43,7 @@
  
  dumpasn1_SOURCES = dumpasn1.c
  
---- rpm-4.2/python/Makefile.am.wiget   Wed Jan  8 23:33:12 2003
-+++ rpm-4.2/python/Makefile.am Thu Mar 27 23:28:05 2003
-@@ -31,42 +31,35 @@
-       $(top_builddir)/lib/.libs/librpm.so \
-       $(top_builddir)/rpmdb/.libs/librpmdb.so \
-       $(top_builddir)/rpmio/.libs/librpmio.so \
--      $(top_builddir)/popt/.libs/libpopt.so \
-+      -lpopt \
-       @WITH_LIBELF_LIB@
- 
- LDADD =
- 
- pythondir = $(pylibdir)/site-packages
--python_PROGRAMS = rpmmodule.so
-+python_LTLIBRARIES = rpmmodule.la
- 
- rpmdbdir = $(pylibdir)/site-packages/rpmdb
--rpmdb_PROGRAMS = _rpmdb.so
-+rpmdb_LTLIBRARIES = _rpmdb.la
- 
--noinst_PROGRAMS = poptmodule.so
- 
--rpmmodule_so_SOURCES =
--rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
-+rpmmodule_la_SOURCES =
-+rpmmodule_la_LIBADD = $(mylibs) $(LIBS) 
-+rpmmodule_la_LDFLAGS = -module -avoid-version
- 
--_rpmdb_so_SOURCES = _rpmdb.c
--_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
-+_rpmdb_la_SOURCES = _rpmdb.c
-+_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
-+_rpmdb_la_LDFLAGS = -module -avoid-version
- 
--poptmodule_so_SOURCES = poptmodule.c
--poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
-+poptmodule_la_SOURCES = poptmodule.c
-+poptmodule_la_LIBADD = $(mylibs) $(LIBS)
-+poptmodule_la_LDFLAGS = -module -avoid-version
- 
--noinst_LTLIBRARIES = librpmmodule.la
-+noinst_LTLIBRARIES = librpmmodule.la poptmodule.la
- librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-       rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
-       rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
- 
--rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
--      $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
--
--_rpmdb.so$(EXEEXT): _rpmdb.lo
--      $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
--
--poptmodule.so$(EXEEXT): poptmodule.lo
--      $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
--
- # rpmmodule.c header-py.c \
- #     rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
- #     rpmrc-py.c rpmte-py.c rpmts-py.c
+
 --- rpm-4.2/tools/Makefile.am.wiget    Fri Mar  7 19:21:19 2003
 +++ rpm-4.2/tools/Makefile.am  Thu Mar 27 23:23:19 2003
 @@ -37,7 +37,7 @@