- added strip-loop patch (system dirs stripping fix; testcase: pkg-config --libs...

- release 2

diff --git a/pkgconfig-strip-loop.patch b/pkgconfig-strip-loop.patch
new file mode 100644 (file)
index 0000000..c0d947e
--- /dev/null
+++ b/pkgconfig-strip-loop.patch
@@ -0,0 +1,24 @@
+From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001
+From: Andrew Oakley <aoakley@espial.com>
+Date: Tue, 29 Apr 2014 13:14:35 +0100
+Subject: Strip system library directories reliably
+
+This loop was changed from a while loop to a for loop in commit
+9bf6277b, but the iterator is now advanced twice each time round the
+loop.
+
+diff --git a/pkg.c b/pkg.c
+index 3697fec..c847c95 100644
+--- a/pkg.c
++++ b/pkg.c
+@@ -917,7 +917,6 @@ verify_package (Package *pkg)
+             }
+           system_dir_iter = system_dir_iter->next;
+         }
+-      iter = iter->next;
+     }
+   g_list_free (system_directories);
+ 
+-- 
+cgit v0.10.2
+

diff --git a/pkgconfig.spec b/pkgconfig.spec
index e033191bb21137f6ef96b55f3ed21a83ac7a08fa..05d8a4a403931dd6f47dda38056f8ceb3a316dd7 100644 (file)
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -5,12 +5,13 @@ Summary(ru.UTF-8):    Инструмент для определения опций
 Summary(uk.UTF-8):     Інструмент для визначення опцій компіляції
 Name:          pkgconfig
 Version:       0.28
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://pkgconfig.freedesktop.org/releases/pkg-config-%{version}.tar.gz
 # Source0-md5: aa3c86e67551adc3ac865160e34a2a0d
+Patch0:                %{name}-strip-loop.patch
 URL:           http://pkgconfig.freedesktop.org/wiki/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -49,6 +50,7 @@ pkgconfig - це інструмент для визначення опцій к
 
 %prep
 %setup -q -n pkg-config-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}