rdieter pushed to kbrickbuster (master). "kf5-ize"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 21:03:02 UTC 2015


>From eb4631a91818e17c035cb78920fb2ae4e7542ea4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 16 Apr 2015 16:02:53 -0500
Subject: kf5-ize


diff --git a/kbrickbuster.spec b/kbrickbuster.spec
index 28203b4..aa5a1b0 100644
--- a/kbrickbuster.spec
+++ b/kbrickbuster.spec
@@ -17,11 +17,35 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 Source0: kbrickbuster-%{version}-rename.tar.xz
 # the script patched source, rename the game
 Source1: patch.sh
+
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifyconfig-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets)  pkgconfig(Qt5Svg)
+BuildRequires: libappstream-glib
 BuildRequires: libkdegames-devel >= %{version}
 
-Requires: libkdegames%{?_isa} >= %{_kde4_version}
-
 Obsoletes: kbreakout < 1:4.14.3-1
 Provides: kbreakout = 1:%{version}-%{release}
 
@@ -33,11 +57,10 @@ without losing the ball.
 %prep
 %setup -q -n %{name}-%{version}-rename
 
-
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -46,31 +69,36 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde
-
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+#appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
-%files -f %{name}.lang
+%files
 %doc COPYING*
-%{_kde4_bindir}/%{name}
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/%{name}/
+%{_kf5_bindir}/%{name}
+#{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+#{_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+%{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+#{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
diff --git a/patch.sh b/patch.sh
index c220e5a..938d9fe 100755
--- a/patch.sh
+++ b/patch.sh
@@ -17,8 +17,8 @@ find $p_dir/ \! \( -name *.svgz -prune \) -type f -exec sed -i -e "s|alienbreako
 find $p_dir/ \! \( -name *.svgz -prune \) -type f -exec sed -i -e "s|KBreakOut|KBrickbuster|g" {} \;
 
 for f in 128 64 48 32 22 16 ; do 
-  if [ -f "$p_dir/pics/hi$f-app-kbreakout.png" ]; then
-  mv $p_dir/pics/hi$f-app-kbreakout.png $p_dir/pics/hi$f-app-kbrickbuster.png
+  if [ -f "$p_dir/pics/hi$f-apps-kbreakout.png" ]; then
+  mv $p_dir/pics/hi$f-apps-kbreakout.png $p_dir/pics/hi$f-apps-kbrickbuster.png
   fi
 done
 
diff --git a/sources b/sources
index d564eb3..35843c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07ab2368af933c7939b31a6de6931cf5  kbrickbuster-15.04.0-rename.tar.xz
+0d9d1b8577843a101679cf19b4cbd10d  kbrickbuster-15.04.0-rename.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kbrickbuster.git/commit/?h=master&id=eb4631a91818e17c035cb78920fb2ae4e7542ea4


More information about the scm-commits mailing list