rpms/pkgconfig/devel .cvsignore, 1.11, 1.12 pkgconfig.spec, 1.39, 1.40 sources, 1.11, 1.12

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18038

Modified Files:
	.cvsignore pkgconfig.spec sources 
Log Message:
0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Sep 2006 13:34:05 -0000	1.11
+++ .cvsignore	10 Jul 2007 14:03:11 -0000	1.12
@@ -1 +1 @@
-pkg-config-0.21.tar.gz
+pkg-config-0.22.tar.gz


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pkgconfig.spec	30 Mar 2007 05:41:50 -0000	1.39
+++ pkgconfig.spec	10 Jul 2007 14:03:11 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
-Version: 0.21
-Release: 5%{?dist}
+Version: 0.22
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 URL: http://pkgconfig.freedesktop.org
@@ -9,11 +9,10 @@
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
 # https://bugs.freedesktop.org/show_bug.cgi?id=2661 
 Patch1:  pkgconfig-0.15.0-reqprov.patch
+# don't call out to glib-config, since our glib-config is a pkg-config wrapper
 Patch2:  pkg-config-0.21-compat-loop.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4738
 Patch3:  pkg-config-0.21-requires-private-fix.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=8788
-Patch4:  pkg-config-0.21-recursive-private-libs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -27,7 +26,6 @@
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
 %patch3 -p1 -b .requires-private-fix
-%patch4 -p1 -b .recursive-private-libs
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -52,6 +50,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Jul 10 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.22-1
+- Update to 0.22
+- Drop upstreamed patch
+
 * Thu Mar 29 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.21-5
 - Fix --exists to ignore Requires.private
 - Fix Requires.private to operate fully recursive


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Sep 2006 13:34:09 -0000	1.11
+++ sources	10 Jul 2007 14:03:11 -0000	1.12
@@ -1 +1 @@
-476f45fab1504aac6697aa7785f0ab91  pkg-config-0.21.tar.gz
+fd5c547e9d66ba49bc735ccb8c791f2a  pkg-config-0.22.tar.gz