[cmake] adjust pkgconfig patch (#812188)

Rex Dieter rdieter at fedoraproject.org
Sat Apr 14 21:28:54 UTC 2012


commit bee44432a9d141af218aa3bfd0a3ae4243142074
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 14 16:31:01 2012 -0500

    adjust pkgconfig patch (#812188)

 cmake-pkgconfig.patch |    2 +-
 cmake.spec            |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cmake-pkgconfig.patch b/cmake-pkgconfig.patch
index ded5a92..5dfea69 100644
--- a/cmake-pkgconfig.patch
+++ b/cmake-pkgconfig.patch
@@ -30,7 +30,7 @@ index 5d93ab1..30aab45 100644
 +# This is needed because the module name is "PkgConfig" but the name of
 +# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
 +# handled by FPHSA.
-+set(PKG_CONFIG_FOUND "${PkgConfig_FOUND}")
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
 +
  # Unsets the given variables
  macro(_pkgconfig_unset var)
diff --git a/cmake.spec b/cmake.spec
index 4bc1551..f79dda3 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.8.8
-Release:        0.3.rc2%{?dist}
+Release:        0.4.rc2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,7 +18,7 @@ Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
 # Patch to find DCMTK in Fedora (bug #720140)
 Patch0:         cmake-dcmtk.patch
-# Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188)
+# (modified) Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188)
 Patch1:         cmake-pkgconfig.patch
 
 
@@ -165,6 +165,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sat Apr 14 2012 Rex Dieter <rdieter at fedoraproject.org> 2.8.8-0.4.rc2
+- adjust pkgconfig patch (#812188)
+
 * Fri Apr 13 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.3.rc2
 - Add upstream patch to set PKG_CONFIG_FOUND (bug #812188)
 


More information about the scm-commits mailing list