rpms/cmake
5
0
Fork 0
Code Issues Pull Requests Releases Activity

adjust pkgconfig patch (#812188)

Browse Source
This commit is contained in:
Rex Dieter 2012-04-14 16:31:01 -05:00
parent 564f6003a0
commit bee44432a9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-pkgconfig.patch
View File

@ -30,7 +30,7 @@ index 5d93ab1..30aab45 100644
+# This is needed because the module name is "PkgConfig" but the name of +# 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 +# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
+# handled by FPHSA. +# handled by FPHSA.
+set(PKG_CONFIG_FOUND "${PkgConfig_FOUND}") +set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
+ +
# Unsets the given variables # Unsets the given variables
macro(_pkgconfig_unset var) macro(_pkgconfig_unset var)

7
cmake.spec
View File

@ -8,7 +8,7 @@
Name: cmake Name: cmake
Version: 2.8.8 Version: 2.8.8
Release: 0.3.rc2%{?dist} Release: 0.4.rc2%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -18,7 +18,7 @@ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake Source2: macros.cmake
# Patch to find DCMTK in Fedora (bug #720140) # Patch to find DCMTK in Fedora (bug #720140)
Patch0: cmake-dcmtk.patch 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 Patch1: cmake-pkgconfig.patch
@ -165,6 +165,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Sat Apr 14 2012 Rex Dieter <rdieter@fedoraproject.org> 2.8.8-0.4.rc2
- adjust pkgconfig patch (#812188)
* Fri Apr 13 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-0.3.rc2 * Fri Apr 13 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.8-0.3.rc2
- Add upstream patch to set PKG_CONFIG_FOUND (bug #812188) - Add upstream patch to set PKG_CONFIG_FOUND (bug #812188)