rdieter pushed to kstars (master). "kf5 port"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 18:37:37 UTC 2015


>From f730bb0315cf22cbd135836e5ca66bf90efebb20 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Tue, 14 Apr 2015 13:30:32 -0500
Subject: kf5 port


diff --git a/kstars.spec b/kstars.spec
index 0572d25..94116a4 100644
--- a/kstars.spec
+++ b/kstars.spec
@@ -16,27 +16,48 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%
 
 ## upstream patches
 
-BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
 %endif
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-karchive-devel
+BuildRequires: kf5-kbookmarks-devel
+BuildRequires: kf5-kcodecs-devel
+BuildRequires: kf5-kcompletion-devel
+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-kdnssd-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kglobalaccel-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-khtml-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildREquires: kf5-knewstuff-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-ktextwidgets-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
 BuildRequires: pkgconfig(cfitsio)
 BuildRequires: pkgconfig(eigen3)
-BuildRequires: pkgconfig(QJson)
+BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5Xml) pkgconfig(Qt5Sql) 
+BuildRequires: pkgconfig(Qt5Svg) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Multimedia) pkgconfig(Qt5Test)
 BuildRequires: pkgconfig(wcslib)
 %if 0%{?fedora}
-# Disable libindi because of update to libindi 1.0.0 which is API incompatible to 0.9.x
-# This is only temporarily until I imported the KF5 based KStars snapshot.
-#BuildRequires: pkgconfig(libindi) >= 0.9.8, libindi-static
+BuildRequires: pkgconfig(libindi) >= 1.0, libindi-static
 BuildRequires: xplanet
 %endif
 
-%{?kde_runtime_requires}
-# https://bugzilla.redhat.com/show_bug.cgi?id=1103853
-# /usr/share/kde4/apps/kstars/scripts/supernova_updates_parser.py
-Requires: pykde4
-
 # when split occurred
 Obsoletes: kdeedu-kstars < 4.7.0-10
 Obsoletes: kdeedu-kstars-libs < 4.7.0-10
@@ -53,9 +74,9 @@ all 8 planets, the Sun and Moon, and thousands of comets and asteroids.
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -64,40 +85,38 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 ## unpackaged files
-# static lib, no api
-rm -fv %{buildroot}%{_kde4_libdir}/libhtmesh.a
-
+rm -fv %{buildroot}%{_kf5_libdir}/libhtmesh.a
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kstars.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kstars.desktop ||:
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor  &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_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
+%files
 %doc COPYING COPYING.DOC 
 %doc AUTHORS ChangeLog README.* TODO
-%{_kde4_bindir}/kstars
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/kstars.desktop
-%{_kde4_datadir}/config.kcfg/kstars.kcfg
-%{_kde4_configdir}/kstars.knsrc
-%{_kde4_appsdir}/kstars/
-%{_kde4_iconsdir}/hicolor/*/*/kstars.*
+%{_kf5_bindir}/kstars
+%{_sysconfdir}/xdg/kstars.knsrc
+%{_datadir}/appdata/kstars.appdata.xml
+%{_kf5_datadir}/applications/org.kde.kstars.desktop
+%{_kf5_datadir}/config.kcfg/kstars.kcfg
+%{_kf5_datadir}/kxmlgui5/kstars/
+%{_kf5_datadir}/kstars/
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_docdir}/HTML/en/kstars/
 
 
 %changelog
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list