- include --x-libraries=/usr/X11R6/%{_lib} in %configure macros

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

diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch
index e6b30d7a44ef3d385bcaaeedc0cf2dd008020ef2..57fd0391d6b2e8f470e0700d22ec2584fc3c562e 100644 (file)
--- a/rpm-python-fix.patch
+++ b/rpm-python-fix.patch
@@ -1,6 +1,6 @@
---- rpm-4.3/python/Makefile.am.wiget   Tue May  6 17:44:12 2003
-+++ rpm-4.3/python/Makefile.am Fri May 16 00:32:43 2003
-@@ -29,30 +29,31 @@
+--- rpm-4.3/python/Makefile.am.wig     2003-06-11 02:09:53.000000000 +0200
++++ rpm-4.3/python/Makefile.am 2003-06-11 02:13:28.000000000 +0200
+@@ -29,47 +29,35 @@
        rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
  
  mylibs= \
@@ -8,10 +8,11 @@
 -      $(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 \
++      $(top_builddir)/lib/librpm.la \
++      $(top_builddir)/rpmdb/librpmdb.la \
++      $(top_builddir)/rpmio/librpmio.la \
++      -lbeecrypt \
++      -lpopt \
        @WITH_LIBELF_LIB@
  
  LDADD =
@@ -25,30 +26,27 @@
 +rpmdb_LTLIBRARIES = _rpmdb.la
  
 -noinst_PROGRAMS = poptmodule.so
--
++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
--
+-rpmmodule_so_LDFLAGS =        $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
+-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
--
--poptmodule_so_SOURCES = poptmodule.c
--poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,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
++poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  
- noinst_LTLIBRARIES = librpmmodule.la
- librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-@@ -60,15 +61,6 @@
+-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 \
++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