[kdegames] fix build
Rex Dieter
rdieter at fedoraproject.org
Sat Sep 29 18:34:45 UTC 2012
commit 7d3be4ba0e576129ae6dc997a893b02359250116
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Sep 29 13:34:21 2012 -0500
fix build
account for dir renames and README/COPYING move(s)
kdegames-4.9.2-renames.patch | 21 +++++++++++++++++++++
kdegames.spec | 14 ++++++++------
2 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/kdegames-4.9.2-renames.patch b/kdegames-4.9.2-renames.patch
new file mode 100644
index 0000000..df98033
--- /dev/null
+++ b/kdegames-4.9.2-renames.patch
@@ -0,0 +1,21 @@
+diff -up kdegames-4.9.2/CMakeLists.txt.renames kdegames-4.9.2/CMakeLists.txt
+--- kdegames-4.9.2/CMakeLists.txt.renames 2012-09-28 10:15:14.000000000 -0500
++++ kdegames-4.9.2/CMakeLists.txt 2012-09-29 13:24:00.755677489 -0500
+@@ -37,7 +37,7 @@ macro_optional_add_subdirectory(granatie
+ 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)
+@@ -67,7 +67,7 @@ macro_optional_add_subdirectory(kspacedu
+ 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)
diff --git a/kdegames.spec b/kdegames.spec
index 704020a..0876218 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -13,8 +13,12 @@ URL: http://www.kde.org/
%global stable stable
%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
+
# Klickety moved here from kdegames3
Conflicts: kdegames3 < 3.5.10-9
@@ -126,6 +130,8 @@ game applications for KDE 4.
%if 0%{?rhel}
%patch0 -p1 -b .minimal
%endif
+%patch50 -p1 -b .rename
+
%build
mkdir -p %{_target_platform}
@@ -139,8 +145,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
## unpackaged files
@@ -181,7 +185,6 @@ fi
%if 0%{?fedora}
%files
-%doc AUTHORS README
%{_kde4_appsdir}/bomber/
%{_kde4_bindir}/bomber
%{_kde4_datadir}/applications/kde4/bomber.desktop
@@ -421,7 +424,6 @@ update-desktop-database -q &> /dev/null ||:
fi
%files minimal
-%doc AUTHORS README
%{_kde4_appsdir}/carddecks/
# kmahjongg
%{_kde4_bindir}/kmahjongg
@@ -452,7 +454,7 @@ fi
%postun libs -p /sbin/ldconfig
%files libs
-%doc COPYING
+%doc libkdegames/COPYING libkdegames/README
%if 0%{?fedora}
%{_kde4_libdir}/libiris_ksirk.so.*
%{_kde4_libdir}/libkolfprivate.so.*
@@ -460,7 +462,7 @@ fi
%endif
%{_kde4_appsdir}/kconf_update/kgthemeprovider-migration.upd
%{_kde4_libdir}/libkdegames.so.*
-%{_kde4_libdir}/libkdegamesprivate.so.1*
+%{_kde4_libdir}/libkdegamesprivate.so.*
%{_kde4_libdir}/libkmahjongglib.so.*
# still no proper soname here
%{_kde4_configdir}/kcardtheme.knsrc
More information about the scm-commits
mailing list