- fixed name in previously added configure switch

[packages/rpm.git] / rpm-python-fix.patch

diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch
index e5913b944d91996fc99c1165d7af834bb67d20dc..50731110128bea05528c4ead19bfd5e0f198ae15 100644 (file)
--- a/rpm-python-fix.patch
+++ b/rpm-python-fix.patch
@@ -1,18 +1,20 @@
---- rpm-4.3/python/Makefile.am.wiget   2003-05-06 17:44:12.000000000 +0200
-+++ rpm-4.3/python/Makefile.am 2003-06-10 13:22:13.859888700 +0200
-@@ -29,45 +29,35 @@
-       rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
+--- rpm.org/python/Makefile.am 2004-06-14 12:02:25.891768016 +0200
++++ rpm/python/Makefile.am     2004-06-14 12:08:23.614385912 +0200
+@@ -27,48 +27,35 @@
+       rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h spec-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)/build/.libs/librpmbuild.so \
 +      $(top_builddir)/lib/librpm.la \
-+      $(top_builddir)/rpmdb/librpmdb.la \
-+      $(top_builddir)/rpmio/librpmio.la \
++      $(top_builddir)/rpmdb/librpmdb.la \
++      $(top_builddir)/rpmio/librpmio.la \
++      $(top_builddir)/build/librpmbuild.la \
 +      -lbeecrypt \
-+      -lpopt \
++      -lpopt \
        @WITH_LIBELF_LIB@
  
  LDADD =
@@ -26,15 +28,14 @@
 +rpmdb_LTLIBRARIES = _rpmdb.la
  
 -noinst_PROGRAMS = poptmodule.so
-+_rpmdb_la_SOURCES = _rpmdb.c
-+_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
-+_rpmdb_la_LDFLAGS = -module -avoid-version
++rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
++rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@
  
 -rpmmodule_so_SOURCES =
 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
-+poptmodule_la_SOURCES = poptmodule.c
-+poptmodule_la_LIBADD = $(mylibs) $(LIBS)
-+poptmodule_la_LDFLAGS = -module -avoid-version
+-rpmmodule_so_LDADD =  @WITH_BEECRYPT_LIB@
++_rpmdb_la_SOURCES = _rpmdb.c
++_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  
 -_rpmdb_so_SOURCES = _rpmdb.c
 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
@@ -44,21 +45,25 @@
 -
 -noinst_LTLIBRARIES = librpmmodule.la
 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-+rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-       rpmbc-py.c rpmmpw-py.c rpmrng-py.c \
-       rpmal-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
+-      rpmal-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 spec-py.c
+-librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES))
 -
--rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
--      $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+-rpmmodule.so$(EXEEXT): librpmmodule.la
+-      $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS)
 -
--_rpmdb.so$(EXEEXT): _rpmdb.lo
--      $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
+-_rpmdb.so$(EXEEXT): _rpmdb.o
+-      $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS)
 -
--poptmodule.so$(EXEEXT): poptmodule.lo
--      $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
-+rpmmodule_la_LIBADD = $(mylibs) $(LIBS)
-+rpmmodule_la_LDFLAGS = -module -avoid-version 
+-poptmodule.so$(EXEEXT): poptmodule.o
+-      $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS)
++poptmodule_la_SOURCES = poptmodule.c
++poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  
++rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
++                     rpmal-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 spec-py.c
++              
  # 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