rdieter pushed to kiten (master). "update for kf5"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 17:29:41 UTC 2015
>From bba7d60323d5d6b3f6dba14a730d7db8394a4248 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Tue, 14 Apr 2015 12:23:45 -0500
Subject: update for kf5
diff --git a/kiten.spec b/kiten.spec
index c27cb24..f4190da 100644
--- a/kiten.spec
+++ b/kiten.spec
@@ -21,10 +21,21 @@ Source1: strip.sh
## upstream patches
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-karchive-devel
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-khtml-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets)
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?kde_runtime_requires}
Requires: kanjistrokeorders-fonts
%description
@@ -45,7 +56,6 @@ Summary: Development files for %{name}
Conflicts: kdeedu-devel < 4.7.0-10
License: LGPLv2+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: kdelibs4-devel
%description devel
%{summary}.
@@ -54,11 +64,10 @@ Requires: kdelibs4-devel
%prep
%setup -q
-
%build
mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -67,14 +76,14 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --with-kde --without-mo
+#find_lang %{name} --with-kde --without-mo
## unpackaged files
rm -fv %{buildroot}%{_datadir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf
%check
-for f in %{buildroot}%{_kde4_datadir}/applications/kde4/kiten*.desktop ; do
+for f in %{buildroot}%{_kf5_datadir}/applications/*kiten*.desktop ; do
desktop-file-validate $f
done
@@ -91,31 +100,33 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
fi
-%files -f %{name}.lang
+%files
%doc COPYING COPYING.DOC
%doc AUTHORS README TODO
-%{_kde4_bindir}/kiten
-%{_kde4_bindir}/kitengen
-%{_kde4_bindir}/kitenkanjibrowser
-%{_kde4_bindir}/kitenradselect
-%{_kde4_appsdir}/kiten/
-%{_kde4_appsdir}/kitenkanjibrowser/
-%{_kde4_appsdir}/kitenradselect/
-%{_kde4_datadir}/appdata/kiten.appdata.xml
-%{_kde4_datadir}/applications/kde4/kiten*.desktop
-%{_kde4_datadir}/config.kcfg/kiten.kcfg
-%{_kde4_iconsdir}/hicolor/*/*/kiten.*
+%{_kf5_bindir}/kiten
+%{_kf5_bindir}/kitengen
+%{_kf5_bindir}/kitenkanjibrowser
+%{_kf5_bindir}/kitenradselect
+%{_kf5_datadir}/kiten/
+%{_datadir}/appdata/kiten.appdata.xml
+%{_kf5_datadir}/applications/*kiten*.desktop
+%{_kf5_datadir}/config.kcfg/kiten.kcfg
+%{_kf5_datadir}/kxmlgui5/kiten/
+%{_kf5_datadir}/kxmlgui5/kitenkanjibrowser/
+%{_kf5_datadir}/kxmlgui5/kitenradselect/
+%{_datadir}/icons/hicolor/*/*/kiten.*
+%{_kf5_docdir}/HTML/en/kiten/
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files libs
%doc COPYING.LIB
-%{_kde4_libdir}/libkiten.so.4*
+%{_kf5_libdir}/libkiten.so.5*
%files devel
-%{_kde4_libdir}/libkiten.so
-%{_kde4_includedir}/libkiten/
+%{_kf5_libdir}/libkiten.so
+%{_includedir}/libkiten/
%changelog
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kiten.git/commit/?h=master&id=bba7d60323d5d6b3f6dba14a730d7db8394a4248
More information about the scm-commits
mailing list