rdieter pushed to okteta (f21). "4.14.3-6 (..more)"

[notifications at fedoraproject.org]

>From 083de1c177f306772da4b9f4518ac3a016623612 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 31 Mar 2015 16:53:50 -0500
Subject: 4.14.3-6

- -part: move kbytearray here
- -libs: move kasten resources/structures here, drop dep on main pkg

diff --git a/okteta.spec b/okteta.spec
index 35ffdb7..659b73a 100644
--- a/okteta.spec
+++ b/okteta.spec
@@ -1,7 +1,7 @@
 Name:    okteta
 Summary: Binary/hex editor
 Version: 4.14.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2+ and GFDL
 URL:     https://projects.kde.org/projects/kde/kdesdk/okteta
@@ -33,7 +33,9 @@ Okteta is a binary/hex editor for KDE
 Summary: Runtime libraries for %{name}
 Obsoletes: kdesdk-okteta-libs < 4.10.80
 Provides:  kdesdk-okteta-libs = %{version}-%{release}
-Requires:  %{name} = %{version}-%{release}
+# struct2osd.sh deps (use Recommends?  -- rex )
+Requires: gccxml
+Requires: libxslt
 %description libs
 %{summary}.
 
@@ -72,17 +74,22 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+#for i in core libs designer kasten parts ; do
+make %{?_smp_mflags} -C %{_target_platform}/$i/
+#done
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+#for i in core libs designer kasten parts ; do
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/$i/
+#done
 
 %find_lang okteta --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}%{_kde4_datadir}/appdata/okteta.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okteta.desktop
 
 
 %post
@@ -104,21 +111,21 @@ fi
 %files -f okteta.lang
 %doc COPYING* README
 %{_kde4_bindir}/okteta
-%{_kde4_bindir}/struct2osd.sh
-%{_kde4_appsdir}/okteta/
+%{_kde4_appsdir}/okteta/oktetaui.rc
 %{_kde4_datadir}/mime/packages/okteta.xml
 %{_kde4_datadir}/applications/kde4/okteta.desktop
-%{_kde4_datadir}/config/okteta-structures.knsrc
 %{_kde4_iconsdir}/hicolor/*/apps/okteta.*
-%{_kde4_libdir}/kde4/libkbytearrayedit.so
-%{_kde4_datadir}/kde4/services/kbytearrayedit.desktop
-%{_kde4_datadir}/config.kcfg/structviewpreferences.kcfg
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
+%{_kde4_datadir}/appdata/okteta.appdata.xml
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files libs
+%dir %{_kde4_appsdir}/okteta/
+%{_kde4_appsdir}/okteta/structures/
+%{_kde4_bindir}/struct2osd.sh
+%{_kde4_datadir}/config/okteta-structures.knsrc
+%{_kde4_datadir}/config.kcfg/structviewpreferences.kcfg
 %{_kde4_libdir}/libkasten*.so.*
 %{_kde4_libdir}/libokteta*.so.*
 %{_kde4_libdir}/kde4/plugins/designer/oktetadesignerplugin.so
@@ -127,6 +134,8 @@ fi
 %{_kde4_appsdir}/oktetapart/
 %{_kde4_libdir}/kde4/oktetapart.so
 %{_kde4_datadir}/kde4/services/oktetapart.desktop
+%{_kde4_libdir}/kde4/libkbytearrayedit.so
+%{_kde4_datadir}/kde4/services/kbytearrayedit.desktop
 
 %files devel
 %{_kde4_includedir}/KDE/Okteta*/
@@ -138,6 +147,10 @@ fi
 
 
 %changelog
+* Tue Mar 31 2015 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-6
+- -part: move kbytearray here
+- -libs: move kasten resources/structures here, drop dep on main pkg
+
 * Tue Mar 31 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-5
 - -devel: Provides: okteta4-devel
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/okteta.git/commit/?h=f21&id=083de1c177f306772da4b9f4518ac3a016623612