From 7d4388ab26cce339fac45dde2a77e05c90980ced Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Sat, 29 Nov 2008 17:26:29 +0000 Subject: [PATCH] - enable automatic generation of pkg-config and libtool dependencies (#465377) --- rpm-4.6.x-no-pkgconfig-reqs.patch | 17 ----------------- rpm.spec | 6 ++---- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 rpm-4.6.x-no-pkgconfig-reqs.patch diff --git a/rpm-4.6.x-no-pkgconfig-reqs.patch b/rpm-4.6.x-no-pkgconfig-reqs.patch deleted file mode 100644 index d503d80..0000000 --- a/rpm-4.6.x-no-pkgconfig-reqs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/macros.in b/macros.in -index 830072a..e75ca18 100644 ---- a/macros.in -+++ b/macros.in -@@ -460,10 +460,10 @@ print (t)\ - %__mono_requires @RPMCONFIGDIR@/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} - - %__libtool_provides @RPMCONFIGDIR@/libtooldeps.sh --provides %{buildroot} %{name} --%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot} %{name} -+#%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot} %{name} - - %__pkgconfig_provides @RPMCONFIGDIR@/pkgconfigdeps.sh --provides --%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires -+#%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires - - #============================================================================== - # ---- Database configuration macros. diff --git a/rpm.spec b/rpm.spec index b58a05b..e09677f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.1 +Release: 0.%{snapver}.2 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -29,8 +29,6 @@ Source1: db-%{bdbver}.tar.gz Patch0: rpm-4.5.90-devel-autodep.patch Patch1: rpm-4.5.90-pkgconfig-path.patch Patch2: rpm-4.5.90-gstreamer-provides.patch -# XXX only create provides for pkgconfig and libtool initially -Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch # Patches already in upstream @@ -164,7 +162,6 @@ that will manipulate RPM packages and databases. %patch0 -p1 -b .devel-autodep %patch1 -p1 -b .pkgconfig-path %patch2 -p1 -b .gstreamer-prov -%patch100 -p1 -b .pkgconfig-deps # needs a bit of upstream love first... #%patch300 -p1 -b .posttrans @@ -358,6 +355,7 @@ exit 0 * Sat Nov 29 2008 Panu Matilainen - update to 4.6.0-rc2 - fixes #471820, #473167, #469355, #468319, #472507, #247374, #426672, #444661 +- enable automatic generation of pkg-config and libtool dependencies #465377 * Fri Oct 31 2008 Panu Matilainen - adjust find-debuginfo for "file" output change (#468129)