From c76f1ba5afff5b976db1e3c137646d809c620f0a Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Jun 07 2011 11:37:22 +0000 Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdegames Conflicts: .gitignore kdegames.spec sources --- diff --git a/kdegames.spec b/kdegames.spec index 5c0e1b1..e382d4c 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -26,7 +26,8 @@ Obsoletes: ksirk < %{version}-%{release} Provides: ksirk = %{version}-%{release} BuildRequires: desktop-file-utils -BuildRequires: ggz-client-libs-devel +# mostly for /etc/rpm/macros.ggz +BuildRequires: ggz-base-libs-devel BuildRequires: kdelibs4-devel >= %{version} BuildRequires: qca2-devel # for Granatier @@ -53,12 +54,6 @@ Requires: python-twisted-core Requires: qt4-sqlite Requires: vorbis-tools -%if "%{?_ggz_version}" < "0.99.5" -%define _skip_ggzconfig -DSKIP_GGZCONFIG=1 -Requires(post): ggz-client-libs -Requires(preun): ggz-client-libs -%endif - %description Games for KDE 4, including: * bomber @@ -133,7 +128,9 @@ game applications for KDE 4. %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} %{?_skip_ggzconfig} -DINSTALL_KAJONGG=TRUE .. +%{cmake_kde4} \ + -DINSTALL_KAJONGG=TRUE \ + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -144,12 +141,6 @@ rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%if 0%{?_skip_ggzconfig:1} -install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc -install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc -install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc -%endif - ## unpackaged files # don't ship internal static libraries rm -fv %{buildroot}%{_kde4_libdir}/liblo{gine,script}.a @@ -163,32 +154,26 @@ done %post -%if 0%{?_skip_ggzconfig:1} -%{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||: -%{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||: -%{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||: -%endif touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || : touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : %post minimal touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : %posttrans gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database -q &> /dev/null ||: %posttrans minimal gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database -q &> /dev/null ||: %postun -update-mime-database %{_datadir}/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || : @@ -196,23 +181,15 @@ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database -q &> /dev/null ||: fi -%if 0%{?_skip_ggzconfig:1} -%preun -if [ $1 -eq 0 ]; then -%{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||: -%{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||: -%{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||: -fi -%endif - %postun minimal -update-mime-database %{_datadir}/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database -q &> /dev/null ||: fi @@ -228,54 +205,230 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS README -%exclude %{_kde4_appsdir}/carddecks/ -# kmahjongg -%exclude %{_kde4_bindir}/kmahjongg -%exclude %{_kde4_appsdir}/kmahjongg/ -%exclude %{_kde4_appsdir}/kmahjongglib/ -%exclude %{_kde4_datadir}/applications/kde4/kmahjongg.desktop -%exclude %{_kde4_datadir}/config.kcfg/kmahjongg.kcfg -%exclude %{_kde4_docdir}/HTML/en/kmahjongg -%exclude %{_kde4_iconsdir}/hicolor/*/*/kmahjongg.* -# kmines -%exclude %{_kde4_bindir}/kmines -%exclude %{_kde4_appsdir}/kmines/ -%exclude %{_kde4_configdir}/kmines.knsrc -%exclude %{_kde4_datadir}/applications/kde4/kmines.desktop -%exclude %{_kde4_docdir}/HTML/en/kmines/ -%exclude %{_kde4_iconsdir}/hicolor/*/*/kmines.* -#kpat -%exclude %{_kde4_bindir}/kpat -%exclude %{_kde4_appsdir}/kpat/ -%exclude %{_kde4_datadir}/applications/kde4/kpat.desktop -%exclude %{_kde4_docdir}/HTML/en/kpat/ -%exclude %{_kde4_iconsdir}/hicolor/*/*/kpat.* - -%{_kde4_bindir}/* -%{_kde4_appsdir}/* -%exclude %{_kde4_appsdir}/cmake/ -%{_kde4_configdir}/* -%{_kde4_datadir}/sounds/*.ogg -%{_kde4_datadir}/sounds/kshisen/*.ogg + +%{_kde4_appsdir}/bomber/ +%{_kde4_bindir}/bomber +%{_kde4_datadir}/applications/kde4/bomber.desktop +%{_kde4_datadir}/config.kcfg/bomber.kcfg +%{_kde4_docdir}/HTML/en/bomber/ +%{_kde4_iconsdir}/hicolor/*/*/bomber.* +%{_kde4_appsdir}/bovo/ +%{_kde4_bindir}/bovo +%{_kde4_datadir}/applications/kde4/bovo.desktop +%{_kde4_docdir}/HTML/en/bovo/ +%{_kde4_iconsdir}/hicolor/*/*/bovo.* +%{_kde4_appsdir}/granatier/ +%{_kde4_bindir}/granatier +%{_kde4_datadir}/applications/kde4/granatier.desktop +%{_kde4_datadir}/config.kcfg/granatier.kcfg +%{_kde4_docdir}/HTML/en/granatier/ +%{_kde4_iconsdir}/hicolor/*/*/granatier.* +%{_kde4_appsdir}/kajongg/ +%{_kde4_bindir}/kajongg* +%{_kde4_datadir}/applications/kde4/kajongg.desktop +%{_kde4_docdir}/HTML/en/kajongg/ +%{_kde4_iconsdir}/hicolor/*/*/kajongg.* +%{_kde4_iconsdir}/hicolor/*/*/games-kajongg-law.* +%{_kde4_appsdir}/kapman/ +%{_kde4_bindir}/kapman +%{_kde4_datadir}/applications/kde4/kapman.desktop %{_kde4_datadir}/sounds/kapman/ -%{_kde4_datadir}/applications/kde4/* -%{_kde4_datadir}/config.kcfg/* +%{_kde4_docdir}/HTML/en/kapman/ +%{_kde4_iconsdir}/hicolor/*/*/kapman.* +%{_kde4_appsdir}/katomic/ +%{_kde4_appsdir}/kconf_update/katomic* +%{_kde4_bindir}/katomic +%{_kde4_datadir}/applications/kde4/katomic.desktop +%{_kde4_configdir}/katomic.knsrc +%{_kde4_docdir}/HTML/en/katomic/ +%{_kde4_iconsdir}/hicolor/*/*/katomic.* +%{_kde4_appsdir}/kbattleship/ +%{_kde4_bindir}/kbattleship +%{_kde4_datadir}/applications/kde4/kbattleship.desktop %{_kde4_datadir}/kde4/services/kbattleship.protocol +%{_kde4_docdir}/HTML/en/kbattleship/ +%{_kde4_iconsdir}/hicolor/*/*/kbattleship.* +%{_kde4_appsdir}/kblackbox/ +%{_kde4_bindir}/kblackbox +%{_kde4_datadir}/applications/kde4/kblackbox.desktop +%{_kde4_docdir}/HTML/en/kblackbox/ +%{_kde4_iconsdir}/hicolor/*/*/kblackbox.* +%{_kde4_appsdir}/kblocks/ +%{_kde4_bindir}/kblocks +%{_kde4_configdir}/kblocks.knsrc +%{_kde4_datadir}/applications/kde4/kblocks.desktop +%{_kde4_datadir}/config.kcfg/kblocks.kcfg +%{_kde4_docdir}/HTML/en/kblocks/ +%{_kde4_iconsdir}/hicolor/*/*/kblocks.* +%{_kde4_appsdir}/kbounce/ +%{_kde4_bindir}/kbounce +%{_kde4_datadir}/applications/kde4/kbounce.desktop +%{_kde4_docdir}/HTML/en/kbounce/ +%{_kde4_iconsdir}/hicolor/*/*/kbounce.* +%{_kde4_appsdir}/kbreakout/ +%{_kde4_bindir}/kbreakout +%{_kde4_datadir}/applications/kde4/kbreakout.desktop +%{_kde4_docdir}/HTML/en/kbreakout/ +%{_kde4_iconsdir}/hicolor/*/*/kbreakout.* +%{_kde4_appsdir}/kdiamond/ +%{_kde4_bindir}/kdiamond +%{_kde4_configdir}/kdiamond.knsrc +%{_kde4_datadir}/applications/kde4/kdiamond.desktop +%{_kde4_datadir}/sounds/KDiamond*.ogg +%{_kde4_docdir}/HTML/en/kdiamond/ +%{_kde4_iconsdir}/hicolor/*/*/kdiamond.* +%{_kde4_appsdir}/kfourinline/ +%{_kde4_bindir}/kfourinline* +%{_kde4_datadir}/applications/kde4/kfourinline.desktop +%{_kde4_datadir}/config.kcfg/kwin4.kcfg +%{_kde4_docdir}/HTML/en/kfourinline/ +%{_kde4_iconsdir}/hicolor/*/*/kfourinline.* +%{_kde4_appsdir}/kgoldrunner/ +%{_kde4_bindir}/kgoldrunner +%{_kde4_configdir}/kgoldrunner.knsrc +%{_kde4_datadir}/applications/kde4/KGoldrunner.desktop +%{_kde4_docdir}/HTML/en/kgoldrunner/ +%{_kde4_iconsdir}/hicolor/*/*/kgoldrunner.* +%{_kde4_appsdir}/kigo/ +%{_kde4_bindir}/kigo +%{_kde4_configdir}/kigo*.knsrc +%{_kde4_datadir}/applications/kde4/kigo.desktop +%{_kde4_datadir}/config.kcfg/kigo.kcfg +%{_kde4_docdir}/HTML/en/kigo/ +%{_kde4_iconsdir}/hicolor/*/*/kigo.* +%{_kde4_appsdir}/killbots/ +%{_kde4_bindir}/killbots +%{_kde4_datadir}/applications/kde4/killbots.desktop +%{_kde4_datadir}/config.kcfg/killbots.kcfg +%{_kde4_docdir}/HTML/en/killbots/ +%{_kde4_iconsdir}/hicolor/*/*/killbots.* +%{_kde4_appsdir}/kiriki/ +%{_kde4_bindir}/kiriki +%{_kde4_datadir}/applications/kde4/kiriki.desktop +%{_kde4_docdir}/HTML/en/kiriki/ +%{_kde4_iconsdir}/hicolor/*/*/kiriki.* +%{_kde4_appsdir}/kjumpingcube/ +%{_kde4_bindir}/kjumpingcube +%{_kde4_datadir}/applications/kde4/kjumpingcube.desktop +%{_kde4_datadir}/config.kcfg/kjumpingcube.kcfg +%{_kde4_docdir}/HTML/en/kjumpingcube/ +%{_kde4_iconsdir}/hicolor/*/*/kjumpingcube.* +%{_kde4_appsdir}/klickety/ +%{_kde4_bindir}/klickety +%{_kde4_appsdir}/kconf_update/klickety* +%{_kde4_datadir}/applications/kde4/klickety.desktop +%{_kde4_datadir}/applications/kde4/ksame.desktop +%{_kde4_docdir}/HTML/en/klickety/ +%{_kde4_iconsdir}/hicolor/*/*/klickety.* +%{_kde4_iconsdir}/hicolor/*/*/ksame.* +%{_kde4_appsdir}/klines/ +%{_kde4_bindir}/klines +%{_kde4_datadir}/applications/kde4/klines.desktop +%{_kde4_datadir}/config.kcfg/klines.kcfg +%{_kde4_docdir}/HTML/en/klines/ +%{_kde4_iconsdir}/hicolor/*/*/klines.* +%{_kde4_appsdir}/knetwalk/ +%{_kde4_bindir}/knetwalk +%{_kde4_datadir}/applications/kde4/knetwalk.desktop +%{_kde4_docdir}/HTML/en/knetwalk/ +%{_kde4_iconsdir}/hicolor/*/*/knetwalk.* +%{_kde4_appsdir}/kolf/ +%{_kde4_bindir}/kolf + /usr/share/applications/kde4/kolf.desktop +%{_kde4_docdir}/HTML/en/kolf/ +%{_kde4_iconsdir}/hicolor/*/*/kolf.* +%{_kde4_appsdir}/kollision/ +%{_kde4_bindir}/kollision +%{_kde4_datadir}/applications/kde4/kollision.desktop +%{_kde4_docdir}/HTML/en/kollision/ +%{_kde4_iconsdir}/oxygen/*/*/kollision.* +%{_kde4_iconsdir}/hicolor/*/*/kollision.* +%{_kde4_appsdir}/konquest/ +%{_kde4_bindir}/konquest +%{_kde4_datadir}/applications/kde4/konquest.desktop +%{_kde4_docdir}/HTML/en/konquest/ +%{_kde4_iconsdir}/hicolor/*/*/konquest.* +%{_kde4_appsdir}/kreversi/ +%{_kde4_bindir}/kreversi +%{_kde4_datadir}/applications/kde4/kreversi.desktop +%{_kde4_docdir}/HTML/en/kreversi/ +%{_kde4_iconsdir}/hicolor/*/*/kreversi.* +%{_kde4_iconsdir}/oxygen/*/*/lastmoves.* +%{_kde4_iconsdir}/oxygen/*/*/legalmoves.* +%{_kde4_appsdir}/ksquares/ +%{_kde4_bindir}/ksquares +%{_kde4_datadir}/applications/kde4/ksquares.desktop +%{_kde4_datadir}/config.kcfg/ksquares.kcfg +%{_kde4_docdir}/HTML/en/ksquares/ +%{_kde4_iconsdir}/hicolor/*/*/ksquares.* +%{_kde4_appsdir}/kshisen/ +%{_kde4_bindir}/kshisen +%{_kde4_datadir}/applications/kde4/kshisen.desktop +%{_kde4_datadir}/config.kcfg/kshisen.kcfg +%{_kde4_datadir}/sounds/kshisen/ +%{_kde4_docdir}/HTML/en/kshisen/ +%{_kde4_iconsdir}/hicolor/*/*/kshisen.* +%{_kde4_appsdir}/ksirk*/ +%{_kde4_bindir}/ksirk* +%{_kde4_configdir}/ksirk.knsrc +%{_kde4_datadir}/applications/kde4/ksirk*.desktop +%{_kde4_datadir}/config.kcfg/ksirk*.kcfg +%{_kde4_docdir}/HTML/en/ksirk*/ +%{_kde4_iconsdir}/hicolor/*/*/ksirk.* +%{_kde4_iconsdir}/locolor/*/*/ksirk.* +%{_kde4_bindir}/kdesnake +%{_kde4_datadir}/applications/kde4/kdesnake.desktop +%{_kde4_iconsdir}/hicolor/*/*/kdesnake.* +%{_kde4_appsdir}/kspaceduel/ +%{_kde4_bindir}/kspaceduel +%{_kde4_datadir}/applications/kde4/kspaceduel.desktop +%{_kde4_datadir}/config.kcfg/kspaceduel.kcfg +%{_kde4_docdir}/HTML/en/kspaceduel/ +%{_kde4_iconsdir}/hicolor/*/*/kspaceduel.* +%{_kde4_appsdir}/ksudoku/ +%{_kde4_bindir}/ksudoku +%{_kde4_configdir}/ksudokurc +%{_kde4_datadir}/applications/kde4/ksudoku.desktop +%{_kde4_docdir}/HTML/en/ksudoku/ +%{_kde4_iconsdir}/hicolor/*/*/ksudoku.* +%{_kde4_appsdir}/ktron/ +%{_kde4_bindir}/ktron +%{_kde4_configdir}/ktron.knsrc +%{_kde4_datadir}/applications/kde4/ktron.desktop +%{_kde4_datadir}/config.kcfg/ktron.kcfg +%{_kde4_docdir}/HTML/en/ktron/ +%{_kde4_iconsdir}/hicolor/*/*/ktron.* +%{_kde4_appsdir}/ktuberling/ +%{_kde4_bindir}/ktuberling +%{_kde4_datadir}/applications/kde4/ktuberling.desktop +%{_kde4_docdir}/HTML/en/ktuberling/ +%{_kde4_iconsdir}/hicolor/*/*/ktuberling.* +%{_kde4_iconsdir}/hicolor/*/*/application-x-tuberling.png +%{_kde4_appsdir}/kubrick/ +%{_kde4_bindir}/kubrick +%{_kde4_datadir}/applications/kde4/kubrick.desktop +%{_kde4_docdir}/HTML/en/kubrick/ +%{_kde4_iconsdir}/hicolor/*/*/kubrick.* +%{_kde4_appsdir}/lskat/ +%{_kde4_bindir}/lskat +%{_kde4_datadir}/applications/kde4/lskat.desktop +%{_kde4_docdir}/HTML/en/lskat/ +%{_kde4_iconsdir}/hicolor/*/*/lskat.* +%{_kde4_appsdir}/palapeli/ +%{_kde4_bindir}/palapeli +%{_kde4_configdir}/palapeli* +%{_kde4_datadir}/applications/kde4/palapeli.desktop %{_kde4_datadir}/kde4/services/ServiceMenus/palapeli_servicemenu.desktop %{_kde4_datadir}/kde4/services/pala*.desktop %{_kde4_datadir}/kde4/servicetypes/libpala-slicerplugin.desktop -%{_kde4_docdir}/HTML/en/* -%{_kde4_iconsdir}/hicolor/*/*/* -%{_kde4_iconsdir}/locolor/*/*/* -%{_kde4_iconsdir}/oxygen/*/*/* %{_kde4_libdir}/kde4/pala*.so %{_datadir}/mime/packages/palapeli-mimetypes.xml -%if 0%{?_skip_ggzconfig:1} -%{_ggz_datadir}/*.dsc -%else +%{_kde4_docdir}/HTML/en/palapeli/ +%{_kde4_iconsdir}/hicolor/*/*/palapeli.* +%{_kde4_iconsdir}/hicolor/*/*/application-x-palapeli.* +# own this, since we have no runtime dep on ggz-base-libs (#645022) +%dir %{_ggz_configdir}/ggz.modules.d/ %{_ggz_configdir}/ggz.modules.d/kdegames -%endif - %files minimal %defattr(-,root,root,-) @@ -300,6 +453,8 @@ rm -rf %{buildroot} #kpat %{_kde4_bindir}/kpat %{_kde4_appsdir}/kpat/ +%{_kde4_configdir}/kpat.knsrc +%{_kde4_datadir}/config.kcfg/kpat.kcfg %{_kde4_datadir}/applications/kde4/kpat.desktop %{_kde4_docdir}/HTML/en/kpat/ %{_kde4_iconsdir}/hicolor/*/*/kpat.* @@ -315,12 +470,15 @@ rm -rf %{buildroot} %{_kde4_libdir}/libkolfprivate.so.* %{_kde4_libdir}/libkmahjongglib.so.* # still no proper soname here +%{_kde4_configdir}/kcardtheme.knsrc %{_kde4_libdir}/libkcardgame.so +%{_kde4_bindir}/libpala-puzzlebuilder %{_kde4_libdir}/libpala.so.* %files devel %defattr(-,root,root,-) -%{_kde4_appsdir}/cmake/modules/* +%{_kde4_appsdir}/cmake/modules/FindLibKDEGames.cmake +%{_kde4_appsdir}/cmake/modules/GGZ.cmake %{_kde4_includedir}/*.h %{_kde4_includedir}/digits/ %{_kde4_includedir}/highscore/ @@ -344,6 +502,14 @@ rm -rf %{buildroot} * Tue Apr 07 2011 Jaroslav Reznik - 6:4.6.80-1 - 4.6.80 (beta1) +* Fri Apr 29 2011 Rex Dieter 6:4.6.3-1 +- 4.6.3 + +* Tue Apr 12 2011 Rex Dieter 6:4.6.2-2 +- Unowned /etc/ggz.modules.d and /usr/share/sounds/kshisen dirs (#645022) +- drop legacy ggz-client-libs bits +- %%files: drop usage of %%exclude + * Wed Apr 06 2011 Than Ngo - 6:4.6.2-1 - 4.6.2