rpms/rpm/devel rpm.spec, 1.306, 1.307 rpm-4.6.x-no-pkgconfig-reqs.patch, 1.1, NONE

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5230

Modified Files:
	rpm.spec 
Removed Files:
	rpm-4.6.x-no-pkgconfig-reqs.patch 
Log Message:
- enable automatic generation of pkg-config and libtool dependencies (#465377)



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- rpm.spec	29 Nov 2008 16:45:45 -0000	1.306
+++ rpm.spec	29 Nov 2008 17:26:29 -0000	1.307
@@ -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 @@
 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 @@
 %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 @@
 * Sat Nov 29 2008 Panu Matilainen <pmatilai at redhat.com>
 - 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 <pmatilai at redhat.com>
 - adjust find-debuginfo for "file" output change (#468129)


--- rpm-4.6.x-no-pkgconfig-reqs.patch DELETED ---