rpms/pkgconfig/devel .cvsignore, 1.7, 1.8 pkgconfig-0.15.0-reqprov.patch, 1.1, 1.2 pkgconfig.spec, 1.16, 1.17 sources, 1.7, 1.8

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/pkgconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10370

Modified Files:
	.cvsignore pkgconfig-0.15.0-reqprov.patch pkgconfig.spec 
	sources 
Log Message:
Update to 0.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2004 10:32:57 -0000	1.7
+++ .cvsignore	7 Jul 2005 19:59:37 -0000	1.8
@@ -1 +1,2 @@
 pkgconfig-0.15.0.tar.gz
+pkg-config-0.18.1.tar.gz

pkgconfig-0.15.0-reqprov.patch:
 main.c |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+)

Index: pkgconfig-0.15.0-reqprov.patch
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig-0.15.0-reqprov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkgconfig-0.15.0-reqprov.patch	30 Mar 2005 16:25:01 -0000	1.1
+++ pkgconfig-0.15.0-reqprov.patch	7 Jul 2005 19:59:37 -0000	1.2
@@ -1,70 +1,69 @@
-diff -ur pkgconfig-0.15.0/main.c pkgconfig-0.15.0/main.c
---- pkgconfig-0.15.0/main.c	2005-02-02 19:12:20.327992745 -0500
-+++ pkgconfig-0.15.0/main.c	2005-02-02 19:15:45.784804237 -0500
-@@ -173,6 +173,8 @@
-   static int want_uninstalled = 0;
-   static char *variable_name = NULL;
-   static int want_exists = 0;
-+  static int want_prov = 0;
-+  static int want_req = 0;
-   static char *required_atleast_version = NULL;
-   static char *required_exact_version = NULL;
-   static char *required_max_version = NULL;
-@@ -244,6 +246,10 @@
-     { "msvc-syntax", 0, POPT_ARG_NONE, &msvc_syntax, 0,
-       "output -l and -L flags for the Microsoft compiler (cl)" },
- #endif
+--- pkg-config-0.18.1/main.c.reqprov	2005-07-07 15:38:55.597133000 -0400
++++ pkg-config-0.18.1/main.c	2005-07-07 15:40:19.400246000 -0400
+@@ -187,6 +187,8 @@
+   int want_uninstalled = 0;
+   char *variable_name = NULL;
+   int want_exists = 0;
++  int want_prov = 0;
++  int want_req = 0;
+   char *required_atleast_version = NULL;
+   char *required_exact_version = NULL;
+   char *required_max_version = NULL;
+@@ -254,6 +256,10 @@
+       "show verbose information about missing or conflicting packages" },
+     { "errors-to-stdout", 0, POPT_ARG_NONE, &want_stdout_errors, 0,
+       "print errors from --print-errors to stdout not stderr" },
 +    { "print-provides", 0, POPT_ARG_NONE, &want_prov, 0,
 +      "print which packages the package provides" },
 +    { "print-requires", 0, POPT_ARG_NONE, &want_req, 0,
 +      "print which packages the package requires" },
-     POPT_AUTOHELP
-     { NULL, 0, 0, NULL, 0 }
-   };
-@@ -521,6 +527,47 @@
+ #ifdef G_OS_WIN32
+     { "dont-define-prefix", 0, POPT_ARG_NONE, &dont_define_prefix, 0,
+       "don't try to override the value of prefix for each .pc file found with "
+@@ -545,6 +551,47 @@
          }
      }
  
-+  if (want_prov)
-+    {
-+      GSList *tmp;
-+      tmp = packages;
-+      while (tmp != NULL)
-+        {
-+          Package *pkg = tmp->data;
-+          char *key;
-+          key = pkg->key;
-+          while (*key == '/')
-+            key++;
-+          if (strlen(key) > 0)
-+            printf ("%s = %s\n", key, pkg->version);
-+          tmp = g_slist_next (tmp);
-+        }
-+    }
++ if (want_prov)
++   {
++     GSList *tmp;
++     tmp = packages;
++     while (tmp != NULL)
++       {
++         Package *pkg = tmp->data;
++         char *key;
++         key = pkg->key;
++         while (*key == '/')
++           key++;
++         if (strlen(key) > 0)
++           printf ("%s = %s\n", key, pkg->version);
++         tmp = g_slist_next (tmp);
++       }
++   }
 +
-+  if (want_req)
-+    {
-+      GSList *pkgtmp = packages;
-+      while (pkgtmp != NULL)
-+        {
-+          Package *pkg = pkgtmp->data;
-+          GSList *reqtmp = pkg->requires;
-+          while (reqtmp != NULL)
-+            {
-+              Package *deppkg = reqtmp->data;
-+              RequiredVersion *req;
-+              req = g_hash_table_lookup(pkg->required_versions, deppkg->key);
-+              if ((req == NULL) || (req->comparison == ALWAYS_MATCH))
-+                printf ("%s\n", deppkg->key);
-+              else
-+                printf ("%s %s %s\n", deppkg->key,
-+                        comparison_to_str(req->comparison),
-+                        req->version);
-+              reqtmp = g_slist_next (reqtmp);
-+            }
-+          pkgtmp = g_slist_next (pkgtmp);
-+        }
-+    }
++ if (want_req)
++   {
++     GSList *pkgtmp = packages;
++     while (pkgtmp != NULL)
++       {
++         Package *pkg = pkgtmp->data;
++         GSList *reqtmp = pkg->requires;
++         while (reqtmp != NULL)
++           {
++             Package *deppkg = reqtmp->data;
++             RequiredVersion *req;
++             req = g_hash_table_lookup(pkg->required_versions, deppkg->key);
++             if ((req == NULL) || (req->comparison == ALWAYS_MATCH))
++               printf ("%s\n", deppkg->key);
++             else
++               printf ("%s %s %s\n", deppkg->key,
++                       comparison_to_str(req->comparison),
++                       req->version);
++             reqtmp = g_slist_next (reqtmp);
++           }
++         pkgtmp = g_slist_next (pkgtmp);
++       }
++   }
 +
    if (required_exact_version)
      {


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pkgconfig.spec	30 Mar 2005 16:25:01 -0000	1.16
+++ pkgconfig.spec	7 Jul 2005 19:59:37 -0000	1.17
@@ -1,17 +1,12 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
-Version: 0.15.0
-Release: 6
+Version: 0.18.1
+Release: 1
 Epoch: 1
 License: GPL
 Group: Development/Tools
-Source:  http://www.freedesktop.org/software/pkgconfig/releases/%{name}-%{version}.tar.gz
+Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
 BuildPrereq: autoconf213 automake14
-# https://bugs.freedesktop.org/show_bug.cgi?id=125
-Patch1:  pkgconfig-0.14.0-lib64.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=119
-Patch2:  pkgconfig-0.14.0-datadir.patch
-Patch3:  pkgconfig-0.15.0-quote.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=2661 
 Patch4:  pkgconfig-0.15.0-overflow.patch
 Patch5:  pkgconfig-0.15.0-reqprov.patch
@@ -23,12 +18,9 @@
 compiler and linker flags.
 
 %prep
-%setup -q
-%patch1 -p1 -b .lib64
-%patch2 -p1 -b .datadir
-%patch3 -p1 -b .quote
+%setup -n pkg-config-%{version} -q
 %patch4 -p1 -b .overflow
-%patch5 -p1 -b .reqprov
+#%patch5 -p1 -b .reqprov
 autoheader-2.13
 autoconf-2.13
 automake-1.4
@@ -54,6 +46,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jul  7 2005 Matthias Clasen <mclasen redhat com> 1:0.18.1-1
+- Update to 0.18.1
+
 * Wed Mar 30 2005 Matthias Clasen <mclasen redhat com> 1:0.15.0-6
 - add --print-requires and --print-provide options
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2004 10:32:57 -0000	1.7
+++ sources	7 Jul 2005 19:59:37 -0000	1.8
@@ -1 +1 @@
-a7e4f60a6657dbc434334deb594cc242  pkgconfig-0.15.0.tar.gz
+311e86f828e1da62163c927dbe27c0c3  pkg-config-0.18.1.tar.gz