rdieter pushed to okteta4 (f22). "simplify packaging, remove most conditionals"

[notifications at fedoraproject.org]

>From 849200ad400c7d84c4960c63387bdd4f88e5b42a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 6 Apr 2015 17:00:22 -0500
Subject: simplify packaging, remove most conditionals


diff --git a/okteta4.spec b/okteta4.spec
index e0b86ac..f2e0a00 100644
--- a/okteta4.spec
+++ b/okteta4.spec
@@ -13,59 +13,24 @@ URL:     https://projects.kde.org/projects/kde/kdesdk/okteta
 %endif
 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
-%if 0%{?fedora} > 19
-BuildRequires: libappstream-glib
-%endif
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= 4.14
 BuildRequires: pkgconfig(qca2)
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-%if "%{name}" == "okteta"
-Conflicts:      kdesdk-common < 4.10.80
-Obsoletes:      kdesdk-okteta < 4.10.80
-Provides:       kdesdk-okteta = %{version}-%{release}
-%endif
-%{?kde_runtime_requires}
-
-# struct2osd.sh deps
-%if 0%{?fedora} > 20
-Recommends: gccxml libxslt
-%else
-Requires: gccxml libxslt
-%endif
-
 %description
 Okteta is a binary/hex editor for KDE
 
 %package libs
 Summary: Runtime libraries and kpart plugins for %{name}
-%if "%{name}" == "okteta"
-Obsoletes: kdesdk-okteta-libs < 4.10.80
-Provides:  kdesdk-okteta-libs = %{version}-%{release}
-%endif
 Provides:  okteta4-part = %{version}-%{release}
 Provides:  okteta4-part%{?_isa} = %{version}-%{release}
-%if "%{name}" != "okteta"
-Obsoletes: okteta-libs < %{obsoletes_evr}
-%endif
 %description libs
 %{summary}.
 
 %package devel
 Summary: Developer files for %{name}
-%if "%{name}" == "okteta"
-Provides: okteta4-devel = %{version}-%{release}
-Obsoletes: kdesdk-okteta-devel < 4.10.80
-Provides:  kdesdk-okteta-devel = %{version}-%{release}
-%endif
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
@@ -91,44 +56,9 @@ for i in %{?components} ; do
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/$i/
 done
 
-# fix permissions
-chmod a+rx %{buildroot}%{_kde4_bindir}/struct2osd.sh
-
-%if "%{name}" == "okteta"
-%find_lang okteta --with-kde --without-mo
-
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/okteta.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okteta.desktop
-
+## unpackaged files
+rm -fv %{buildroot}%{_kde4_bindir}/struct2osd.sh
 
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-touch --no-create %{_kde4_datadir}/mime ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /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 %{_kde4_datadir}/mime ||:
-update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
-fi
-
-%files -f okteta.lang
-%doc COPYING* README
-%{_kde4_bindir}/okteta
-%{_kde4_bindir}/struct2osd.sh
-%{_kde4_appsdir}/okteta/oktetaui.rc
-%{_kde4_datadir}/mime/packages/okteta.xml
-%{_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
@@ -161,6 +91,7 @@ fi
 %changelog
 * Mon Apr 06 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-52
 - -libs: drop conflicting struct2osd.sh
+- simplify packaging, remove most conditionals
 
 * Sun Apr 05 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-51
 - drop needless Obsoletes, fix struct2osd.sh permissions
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/okteta4.git/commit/?h=f22&id=849200ad400c7d84c4960c63387bdd4f88e5b42a