From a6236def165596ae636c47d2b39466737a0530f6d8ad2136a33d5a4a7516018f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 14 Nov 2012 12:55:57 +0000 Subject: [PATCH 1/2] - Add cmake-gettext-typo.patch to fix gettext detection OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=101 --- cmake-gettext-typo.patch | 10 ++++++++++ cmake.changes | 5 +++++ cmake.spec | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 cmake-gettext-typo.patch diff --git a/cmake-gettext-typo.patch b/cmake-gettext-typo.patch new file mode 100644 index 0000000..78d03c8 --- /dev/null +++ b/cmake-gettext-typo.patch @@ -0,0 +1,10 @@ +Index: cmake-2.8.10.1/Modules/FindGettext.cmake +=================================================================== +--- cmake-2.8.10.1.orig/Modules/FindGettext.cmake ++++ cmake-2.8.10.1/Modules/FindGettext.cmake +@@ -210,4 +210,4 @@ function(GETTEXT_PROCESS_PO_FILES _lang) + + endfunction() + +-set(GETTEXT_FOUND ${Gettext_FOUND}) ++set(GETTEXT_FOUND ${GETTEXT_FOUND}) diff --git a/cmake.changes b/cmake.changes index 8f6caab..3bd1064 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 14 12:55:10 UTC 2012 - idonmez@suse.com + +- Add cmake-gettext-typo.patch to fix gettext detection + ------------------------------------------------------------------- Wed Nov 7 21:24:45 UTC 2012 - cgiboudeaux@gmx.com diff --git a/cmake.spec b/cmake.spec index eced0d8..7996b37 100644 --- a/cmake.spec +++ b/cmake.spec @@ -23,6 +23,7 @@ Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-fix-ruby-test.patch +Patch3: cmake-gettext-typo.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -51,6 +52,7 @@ CMake is a cross-platform, open-source make system %setup -q %patch1 %patch2 +%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" From 714f336ac719e195274afb2d5a0e14a32ea7a9812988232f04b812bdc0aff8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 14 Nov 2012 12:58:30 +0000 Subject: [PATCH 2/2] - Add cmake-gettext.patch to fix gettext detection OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=102 --- cmake-gettext-typo.patch => cmake-gettext.patch | 6 +++--- cmake.changes | 2 +- cmake.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename cmake-gettext-typo.patch => cmake-gettext.patch (70%) diff --git a/cmake-gettext-typo.patch b/cmake-gettext.patch similarity index 70% rename from cmake-gettext-typo.patch rename to cmake-gettext.patch index 78d03c8..397d50b 100644 --- a/cmake-gettext-typo.patch +++ b/cmake-gettext.patch @@ -2,9 +2,9 @@ Index: cmake-2.8.10.1/Modules/FindGettext.cmake =================================================================== --- cmake-2.8.10.1.orig/Modules/FindGettext.cmake +++ cmake-2.8.10.1/Modules/FindGettext.cmake -@@ -210,4 +210,4 @@ function(GETTEXT_PROCESS_PO_FILES _lang) +@@ -209,5 +209,3 @@ function(GETTEXT_PROCESS_PO_FILES _lang) + add_dependencies(pofiles ${uniqueTargetName}) endfunction() - +- -set(GETTEXT_FOUND ${Gettext_FOUND}) -+set(GETTEXT_FOUND ${GETTEXT_FOUND}) diff --git a/cmake.changes b/cmake.changes index 3bd1064..0997ca3 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Nov 14 12:55:10 UTC 2012 - idonmez@suse.com -- Add cmake-gettext-typo.patch to fix gettext detection +- Add cmake-gettext.patch to fix gettext detection ------------------------------------------------------------------- Wed Nov 7 21:24:45 UTC 2012 - cgiboudeaux@gmx.com diff --git a/cmake.spec b/cmake.spec index 7996b37..2575802 100644 --- a/cmake.spec +++ b/cmake.spec @@ -23,7 +23,7 @@ Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-fix-ruby-test.patch -Patch3: cmake-gettext-typo.patch +Patch3: cmake-gettext.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building