rdieter pushed to okteta (f22). "4.14.3-8 (..more)"

[notifications at fedoraproject.org]

>From 78a700ca5c173dcec4f7791ee4155a63c45d3eb0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 1 Apr 2015 12:03:47 -0500
Subject: 4.14.3-8

- drop -part subpkg (include in -libs)
- more prep for okteta4 compat pkg

diff --git a/okteta.spec b/okteta.spec
index dcbe238..cf7b692 100644
--- a/okteta.spec
+++ b/okteta.spec
@@ -1,7 +1,7 @@
 Name:    okteta
 Summary: Binary/hex editor
 Version: 4.14.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2+ and GFDL
 URL:     https://projects.kde.org/projects/kde/kdesdk/okteta
@@ -11,7 +11,14 @@ URL:     https://projects.kde.org/projects/kde/kdesdk/okteta
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/%{version}/src/okteta-%{version}.tar.xz
+
+%if "%{name}" == "okteta"
+%global components /
+%else
+%global components core gui libs designer kasten parts
+%global obsoletes_evr 4.14.3-50
+%endif
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs4-devel >= 4.14
@@ -20,7 +27,7 @@ BuildRequires: libappstream-glib
 %endif
 BuildRequires: pkgconfig(qca2)
 
-Requires:       %{name}-part%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Conflicts:      kdesdk-common < 4.10.80
 Obsoletes:      kdesdk-okteta < 4.10.80
 Provides:       kdesdk-okteta = %{version}-%{release}
@@ -37,39 +44,35 @@ Requires: gccxml libxslt
 Okteta is a binary/hex editor for KDE
 
 %package libs
-Summary: Runtime libraries for %{name}
+Summary: Runtime libraries and kpart plugins for %{name}
 Obsoletes: kdesdk-okteta-libs < 4.10.80
 Provides:  kdesdk-okteta-libs = %{version}-%{release}
-%description libs
-%{summary}.
-
-%package part
-Summary: KDE4 Okteta kpart plugin
-%if "%{name}" == "okteta"
+Obsoletes: okteta-part < 4.14.3-8
 Provides:  okteta4-part = %{version}-%{release}
 Provides:  okteta4-part%{?_isa} = %{version}-%{release}
+%if "%{name}" != "okteta"
+Obsoletes: okteta-libs < %{obsoletes_evr}
 %endif
-%if "%{name}" == "okteta4"
-Obsoletes: okteta-part < %{obsoletes_evr}
-Provides:  okteta-part = %{version}-%{release}
-Provides:  okteta-part%{?_isa} = %{version}-%{release}
 %endif
-Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
-%description part
-%{summary}, needed by some KDE4 applications.
+%description libs
+%{summary}.
 
 %package devel
 Summary: Developer files for %{name}
+%if "%{name}" == "okteta"
+Provides: okteta4-devel = %{version}-%{release}
+%else
+Obsoletes: okteta-devel < %{obsoletes_evr}
+%endif
 Obsoletes: kdesdk-okteta-devel < 4.10.80
 Provides:  kdesdk-okteta-devel = %{version}-%{release}
-Provides:  okteta4-devel = %{version}-%{release}
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q
+%setup -q -n okteta-%{version}
 
 
 %build
@@ -78,16 +81,17 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-#for i in core libs designer kasten parts ; do
+for i in %{?components} ; do
 make %{?_smp_mflags} -C %{_target_platform}/$i/
-#done
+done
 
 
 %install
-#for i in core libs designer kasten parts ; do
+for i in %{?components} ; do
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/$i/
-#done
+done
 
+%if "%{name}" == "okteta"
 %find_lang okteta --with-kde --without-mo
 
 
@@ -121,11 +125,13 @@ fi
 %{_kde4_datadir}/applications/kde4/okteta.desktop
 %{_kde4_iconsdir}/hicolor/*/apps/okteta.*
 %{_kde4_datadir}/appdata/okteta.appdata.xml
+%endif
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files libs
+# libs
 %dir %{_kde4_appsdir}/okteta/
 %{_kde4_appsdir}/okteta/structures/
 %{_kde4_bindir}/struct2osd.sh
@@ -134,8 +140,7 @@ fi
 %{_kde4_libdir}/libkasten*.so.*
 %{_kde4_libdir}/libokteta*.so.*
 %{_kde4_libdir}/kde4/plugins/designer/oktetadesignerplugin.so
-
-%files part
+# part
 %{_kde4_appsdir}/oktetapart/
 %{_kde4_libdir}/kde4/oktetapart.so
 %{_kde4_datadir}/kde4/services/oktetapart.desktop
@@ -152,6 +157,10 @@ fi
 
 
 %changelog
+* Wed Apr 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-8
+- drop -part subpkg (include in -libs)
+- more prep for okteta4 compat pkg
+
 * Tue Mar 31 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-7
 - move struct2osd.sh to main pkg, use Recommends for its runtime deps
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/okteta.git/commit/?h=f22&id=78a700ca5c173dcec4f7791ee4155a63c45d3eb0