rdieter pushed to kwordquiz (master). "kf5-ize, fix filenames/install-paths"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 23:56:04 UTC 2015
>From 563b76f978671bd300d53d4a57053942a7c27596 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 18:55:20 -0500
Subject: kf5-ize, fix filenames/install-paths
diff --git a/kwordquiz-15.04.0-fix.patch b/kwordquiz-15.04.0-fix.patch
new file mode 100644
index 0000000..659c6e1
--- /dev/null
+++ b/kwordquiz-15.04.0-fix.patch
@@ -0,0 +1,24 @@
+diff -up kwordquiz-15.04.0/CMakeLists.txt.fix kwordquiz-15.04.0/CMakeLists.txt
+--- kwordquiz-15.04.0/CMakeLists.txt.fix 2015-03-20 05:18:28.000000000 -0500
++++ kwordquiz-15.04.0/CMakeLists.txt 2015-04-18 18:52:30.507128215 -0500
+@@ -48,5 +48,5 @@ add_definitions(-DQT_USE_FAST_CONCATENAT
+ add_subdirectory(doc)
+ add_subdirectory(src)
+
+-install(FILES kwordquiz.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
++install(FILES kwordquiz.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ RENAME org.kde.kwordquiz.appdata.xml )
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff -up kwordquiz-15.04.0/src/CMakeLists.txt.fix kwordquiz-15.04.0/src/CMakeLists.txt
+--- kwordquiz-15.04.0/src/CMakeLists.txt.fix 2015-03-20 05:18:28.000000000 -0500
++++ kwordquiz-15.04.0/src/CMakeLists.txt 2015-04-18 18:51:55.653962735 -0500
+@@ -98,8 +98,8 @@ install(TARGETS kwordquiz ${INSTALL_TAR
+
+ install( PROGRAMS org.kde.kwordquiz.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ install( FILES kwordquiz.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+-install( FILES kwordquiz.knsrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
+-install( FILES kwordquiz.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kwordquiz )
++install( FILES kwordquiz.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
++install( FILES kwordquiz.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
+ install(FILES
+ kwordquizui.rc
+ DESTINATION ${KXMLGUI_INSTALL_DIR}/kwordquiz)
diff --git a/kwordquiz.spec b/kwordquiz.spec
index d5b3d20..30362b6 100644
--- a/kwordquiz.spec
+++ b/kwordquiz.spec
@@ -13,15 +13,42 @@ URL: https://projects.kde.org/projects/kde/kdeedu/%{name}
%endif
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
+## upsteamable patches
+# wrong paths, misnamed
+Patch1: kwordquiz-15.04.0-fix.patch
+
+BuildRequires: cmake
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
-%if 0%{?fedora} > 19
+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-kcrash-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kdelibs4support-devel
+BuildRequires: kf5-kdoctools-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-knotifications-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(phonon4qt5)
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg)
BuildRequires: libappstream-glib
-%endif
-BuildRequires: libkdeedu-devel >= %{version}
-
-%{?kde_runtime_requires}
-Requires: libkdeedu%{?_isa} >= %{version}
+BuildRequires: libkeduvocdocument-devel
# when split occurred
Conflicts: kdeedu < 4.7.0-10
@@ -33,11 +60,13 @@ Conflicts: kdeedu < 4.7.0-10
%prep
%setup -q
+%patch1 -p1 -b .fix
+
%build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -46,36 +75,40 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --with-kde --without-mo
-
%check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_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
-%files -f %{name}.lang
-%doc AUTHORS COPYING README TODO
-%{_kde4_bindir}/kwordquiz
-%{_kde4_appsdir}/kwordquiz/
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/kwordquiz.desktop
-%{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
-%{_kde4_configdir}/kwordquiz.knsrc
-# match also mimetypes icons (application-x-kwordquiz)
-%{_kde4_iconsdir}/hicolor/*/*/*kwordquiz.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc COPYING*
+%doc README
+%{_kf5_bindir}/%{name}
+%{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}.*
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kconf_update/%{name}*
+%{_kf5_datadir}/knotifications5/%{name}.notifyrc
+%{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+%{_kf5_datadir}/config.kcfg/%{name}.kcfg
%changelog
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kwordquiz.git/commit/?h=master&id=563b76f978671bd300d53d4a57053942a7c27596
More information about the scm-commits
mailing list