[kdegames] adapt minimal patch
Than Ngo
than at fedoraproject.org
Mon Oct 22 13:26:11 UTC 2012
commit 988b44b24800c641e20ff4b93c17702723c9db75
Author: Than Ngo <than at redhat.com>
Date: Mon Oct 22 15:25:43 2012 +0200
adapt minimal patch
...0-minimal.patch => kdegames-4.9.2-minimal.patch | 15 +++++++--------
kdegames.spec | 16 ++++++++++------
2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/kdegames-4.9.0-minimal.patch b/kdegames-4.9.2-minimal.patch
similarity index 81%
rename from kdegames-4.9.0-minimal.patch
rename to kdegames-4.9.2-minimal.patch
index 9111afe..8f2a428 100644
--- a/kdegames-4.9.0-minimal.patch
+++ b/kdegames-4.9.2-minimal.patch
@@ -1,7 +1,7 @@
-diff -up kdegames-4.9.0/CMakeLists.txt.rhel kdegames-4.9.0/CMakeLists.txt
---- kdegames-4.9.0/CMakeLists.txt.rhel 2012-05-30 18:50:18.000000000 +0200
-+++ kdegames-4.9.0/CMakeLists.txt 2012-08-21 15:08:11.736167065 +0200
-@@ -39,50 +39,10 @@ set(HIGHSCORE_DIRECTORY "" CACHE STRING
+diff -up kdegames-4.9.2/CMakeLists.txt.minimal kdegames-4.9.2/CMakeLists.txt
+--- kdegames-4.9.2/CMakeLists.txt.minimal 2012-09-28 17:15:14.000000000 +0200
++++ kdegames-4.9.2/CMakeLists.txt 2012-10-22 14:50:40.395915017 +0200
+@@ -31,50 +31,9 @@ include_directories(${CMAKE_SOURCE_DIR}/
add_subdirectory(libkdegames)
add_subdirectory(libkmahjongg)
@@ -11,7 +11,7 @@ diff -up kdegames-4.9.0/CMakeLists.txt.rhel kdegames-4.9.0/CMakeLists.txt
-macro_optional_add_subdirectory(lskat)
-macro_optional_add_subdirectory(kapman)
-macro_optional_add_subdirectory(katomic)
--macro_optional_add_subdirectory(kbattleship)
+-macro_optional_add_subdirectory(knavalbattle)
-macro_optional_add_subdirectory(kblackbox)
-macro_optional_add_subdirectory(kblocks)
-macro_optional_add_subdirectory(kbounce)
@@ -41,7 +41,7 @@ diff -up kdegames-4.9.0/CMakeLists.txt.rhel kdegames-4.9.0/CMakeLists.txt
-macro_optional_add_subdirectory(ksquares)
-macro_optional_add_subdirectory(ksudoku)
-macro_optional_add_subdirectory(ktuberling)
--macro_optional_add_subdirectory(ktron)
+-macro_optional_add_subdirectory(ksnakeduel)
-if(OPENGL_SUPPORT)
- macro_optional_add_subdirectory(kubrick)
-endif(OPENGL_SUPPORT)
@@ -49,7 +49,6 @@ diff -up kdegames-4.9.0/CMakeLists.txt.rhel kdegames-4.9.0/CMakeLists.txt
-if(PYTHONINTERP_FOUND)
- macro_optional_add_subdirectory(kajongg)
-endif(PYTHONINTERP_FOUND)
-+
- macro_optional_add_subdirectory(doc)
macro_display_feature_log()
+
diff --git a/kdegames.spec b/kdegames.spec
index b389b0d..9c24c3b 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -2,7 +2,7 @@ Name: kdegames
Summary: KDE Games
Epoch: 6
Version: 4.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: http://www.kde.org/
@@ -14,11 +14,12 @@ URL: http://www.kde.org/
%endif
Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdegames-%{version}.tar.xz
-Patch0: kdegames-4.9.0-minimal.patch
-
## upstreamable patches
Patch50: kdegames-4.9.2-renames.patch
+# rhel patches
+Patch500: kdegames-4.9.2-minimal.patch
+
# Klickety moved here from kdegames3
Conflicts: kdegames3 < 3.5.10-9
@@ -128,11 +129,11 @@ game applications for KDE 4.
%prep
%setup -q -n kdegames-%{version}%{?alphatag}
+
+%patch50 -p1 -b .rename
%if 0%{?rhel}
-%patch0 -p1 -b .minimal
+%patch500 -p1 -b .minimal
%endif
-%patch50 -p1 -b .rename
-
%build
mkdir -p %{_target_platform}
@@ -487,6 +488,9 @@ fi
%changelog
+* Mon Oct 22 2012 Than Ngo <than at redhat.com> - 6:4.9.2-3
+- adapt minimal patch
+
* Wed Oct 03 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.9.2-2
- -libs: Requires: kdelibs4 ...
More information about the scm-commits
mailing list