From 9be79001534f8d46863027aaa2d0a1cbdbc0f2c8 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 10:31:44 +0000
Subject: auto-import changelog data from pkgconfig-0.14.0-6.src.rpm

0.14.0-6
- Make pkgconfig look in /usr/share/pkgconfig as well by default (#98595)
0.14.0-5
- rebuild
Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt

---

diff --git a/pkgconfig-0.14.0-datadir.patch b/pkgconfig-0.14.0-datadir.patch
new file mode 100644
index 0000000..008e49a
--- /dev/null
+++ b/pkgconfig-0.14.0-datadir.patch
@@ -0,0 +1,21 @@
+--- pkgconfig-0.14.0/Makefile.am.datadir	2002-09-23 16:38:34.000000000 -0400
++++ pkgconfig-0.14.0/Makefile.am	2003-10-23 17:25:53.000000000 -0400
+@@ -15,7 +15,7 @@
+ 
+ bin_PROGRAMS = pkg-config
+ 
+-INCLUDES=-DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes)
++INCLUDES=-DPKGLIBDIR="\"$(pkglibdir)\"" -DPKGDATADIR="\"$(pkgdatadir)\"" $(included_glib_includes)
+ 
+ pkg_config_SOURCES= \
+ 	pkg.h \
+--- pkgconfig-0.14.0/pkg.c.datadir	2003-10-23 17:24:54.000000000 -0400
++++ pkgconfig-0.14.0/pkg.c	2003-10-23 17:24:54.000000000 -0400
+@@ -198,6 +198,7 @@
+       
+       g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
+       scan_dir (PKGLIBDIR);
++      scan_dir (PKGDATADIR);
+     }
+ }
+ 
diff --git a/pkgconfig.spec b/pkgconfig.spec
index 4a473f7..6557fb7 100644
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -1,13 +1,16 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.14.0
-Release: 3
+Release: 6
 Epoch: 1
 License: GPL
 Group: Development/Tools
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/%{name}-%{version}.tar.gz
-BuildPrereq: autoconf213
-Patch:  pkgconfig-0.14.0-lib64.patch
+BuildPrereq: autoconf213 automake14
+# http://x2.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=125
+Patch1:  pkgconfig-0.14.0-lib64.patch
+# http://x2.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=119
+Patch2:  pkgconfig-0.14.0-datadir.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -17,9 +20,11 @@ compiler and linker flags.
 
 %prep
 %setup -q
-%patch -p1 -b .lib64
+%patch1 -p1 -b .lib64
+%patch2 -p1 -b .datadir
 autoheader-2.13
 autoconf-2.13
+automake-1.4
 
 %build
 %configure
@@ -42,6 +47,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Oct 23 2003 Owen Taylor <otaylor@redhat.com> 1:0.14.0-6
+- Make pkgconfig look in /usr/share/pkgconfig as well by default (#98595)
+
+* Thu Jun 26 2003 Havoc Pennington <hp@redhat.com> 1:0.14.0-5
+- rebuild
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Mon Feb 10 2003 Nalin Dahyabhai <nalin@redhat.com>
 - suppress /usr/lib64 (instead of /usr/lib) from LIBS by default on multilib
   arches where the default is to use lib64