rpms/pkgconfig/devel .cvsignore, 1.13, 1.14 pkgconfig.spec, 1.54, 1.55 sources, 1.13, 1.14 pkg-config-0.21-requires-private-fix.patch, 1.3, NONE pkgconfig-0.15.0-reqprov.patch, 1.3, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7930

Modified Files:
	.cvsignore pkgconfig.spec sources 
Removed Files:
	pkg-config-0.21-requires-private-fix.patch 
	pkgconfig-0.15.0-reqprov.patch 
Log Message:
0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	31 Jan 2008 02:17:59 -0000	1.13
+++ .cvsignore	24 May 2010 01:21:16 -0000	1.14
@@ -1 +1 @@
-pkg-config-0.23.tar.gz
+pkg-config-0.24.tar.gz


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- pkgconfig.spec	26 Jul 2009 18:51:21 -0000	1.54
+++ pkgconfig.spec	24 May 2010 01:21:16 -0000	1.55
@@ -1,14 +1,15 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
-Version: 0.23
-Release: 9%{?dist}
+Version: 0.24
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
 Group: Development/Tools
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
-# https://bugs.freedesktop.org/show_bug.cgi?id=5703
-Patch1:  pkgconfig-0.15.0-reqprov.patch
+BuildRequires: glib2-devel
+BuildRequires: popt-devel
+
 # 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=16095
@@ -16,8 +17,6 @@ Patch3: pkg-config-lib64-excludes.patch
 
 Provides: pkgconfig(pkg-config) = %{version}
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
 %description
 The pkgconfig tool determines compilation options. For each required
 library, it reads the configuration file and outputs the necessary
@@ -25,26 +24,28 @@ compiler and linker flags.
 
 %prep
 %setup -n pkg-config-%{version} -q
-%patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
 %patch3 -p0 -b .lib64
 
 %build
-%configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
+%configure \
+        --disable-shared \
+        --with-installed-glib \
+        --with-installed-popt \
+        --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# we include this below, already
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pkg-config
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS README NEWS COPYING
+%doc AUTHORS README NEWS COPYING pkg-config-guide.html
 %{_mandir}/*/*
 %{_bindir}/*
 %{_libdir}/pkgconfig
@@ -52,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Sun May 23 2010 Matthias Clasen <mclasen at redhat.com> 0.24-1
+- Update to 0.24
+- Use system glib, popt
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.23-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	31 Jan 2008 02:17:59 -0000	1.13
+++ sources	24 May 2010 01:21:16 -0000	1.14
@@ -1 +1 @@
-d922a88782b64441d06547632fd85744  pkg-config-0.23.tar.gz
+597a98e254943995f2ad5f3f1dac0e4a  pkg-config-0.24.tar.gz


--- pkg-config-0.21-requires-private-fix.patch DELETED ---


--- pkgconfig-0.15.0-reqprov.patch DELETED ---