rpms/rpm/devel rpm.spec,1.156,1.157

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16316

Modified Files:
	rpm.spec 
Log Message:
Patch from mitr at redhat.com
Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891)+- Don't ship static version of _rpmdb.so
BuildRequires: readline-devel



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- rpm.spec	27 Apr 2005 15:02:13 -0000	1.156
+++ rpm.spec	3 May 2005 14:05:57 -0000	1.157
@@ -20,7 +20,7 @@
 %define version 4.4.1
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 11
+Release: 12
 Group: System Environment/Base
 Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
 Patch0: rpm-4.4.1-posttrans.patch
@@ -44,7 +44,7 @@
 BuildRequires: elfutils-libelf
 BuildRequires: elfutils-devel
 
-BuildRequires: zlib-devel
+BuildRequires: sed readline-devel zlib-devel
 
 BuildRequires: beecrypt-devel >= 4.1.2
 Requires: beecrypt >= 4.1.2
@@ -185,6 +185,15 @@
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
+# Working around breakage from the -L$(RPM_BUILD_ROOT)... -L$(DESTDIR)...
+# workaround to #132435,
+# and from linking to included zlib
+for i in librpm.la librpmbuild.la librpmdb.la librpmio.la ; do
+	sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \
+		-e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \
+		"$RPM_BUILD_ROOT%{__libdir}/$i"
+done
+
 %ifos linux
 
 # Save list of packages through cron
@@ -221,6 +230,7 @@
 %if %{with_python_subpackage}
   rm -f .%{__libdir}/python%{with_python_version}/site-packages/*.{a,la}
   rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
+  rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpmdb/*.{a,la}
 %endif
 }
 
@@ -519,6 +529,11 @@
 %{__includedir}/popt.h
 
 %changelog
+* Sat Apr 30 2005 Miloslav Trmac <mitr at redhat.com> - 4.4.1-12
+- Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891)
+- Don't ship static version of _rpmdb.so
+- BuildRequires: readline-devel
+
 * Wed Apr 27 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.1-11
 - Fix for (pre,postun) (#155700)
 - Erase ordering