rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- enable automatic generation of pkg-config and libtool dependencies

Browse Source 
(#465377)
This commit is contained in:
Panu Matilainen 2008-11-29 17:26:29 +00:00
parent ae7c31e780
commit 7d4388ab26
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpm-4.6.x-no-pkgconfig-reqs.patch
View File

@ -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.

6
rpm.spec
View File

@ -18,7 +18,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 0.%{snapver}.1 Release: 0.%{snapver}.2
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 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 Patch0: rpm-4.5.90-devel-autodep.patch
Patch1: rpm-4.5.90-pkgconfig-path.patch Patch1: rpm-4.5.90-pkgconfig-path.patch
Patch2: rpm-4.5.90-gstreamer-provides.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 # Patches already in upstream
@ -164,7 +162,6 @@ that will manipulate RPM packages and databases.
%patch0 -p1 -b .devel-autodep %patch0 -p1 -b .devel-autodep
%patch1 -p1 -b .pkgconfig-path %patch1 -p1 -b .pkgconfig-path
%patch2 -p1 -b .gstreamer-prov %patch2 -p1 -b .gstreamer-prov
%patch100 -p1 -b .pkgconfig-deps
# needs a bit of upstream love first... # needs a bit of upstream love first...
#%patch300 -p1 -b .posttrans #%patch300 -p1 -b .posttrans
@ -358,6 +355,7 @@ exit 0
* Sat Nov 29 2008 Panu Matilainen <pmatilai@redhat.com> * Sat Nov 29 2008 Panu Matilainen <pmatilai@redhat.com>
- update to 4.6.0-rc2 - update to 4.6.0-rc2
- fixes #471820, #473167, #469355, #468319, #472507, #247374, #426672, #444661 - 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 <pmatilai@redhat.com> * Fri Oct 31 2008 Panu Matilainen <pmatilai@redhat.com>
- adjust find-debuginfo for "file" output change (#468129) - adjust find-debuginfo for "file" output change (#468129)