rdieter pushed to okteta (master). "move struct2osd.sh to main pkg, use Recommends for its runtime deps"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 02:21:39 UTC 2015


>From 5353018dda65d7f209eacdd963749b06f89a1b20 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 31 Mar 2015 21:21:28 -0500
Subject: move struct2osd.sh to main pkg, use Recommends for its runtime deps


diff --git a/okteta.spec b/okteta.spec
index 659b73a..6f37e26 100644
--- a/okteta.spec
+++ b/okteta.spec
@@ -1,7 +1,7 @@
 Name:    okteta
 Summary: Binary/hex editor
 Version: 4.14.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2+ and GFDL
 URL:     https://projects.kde.org/projects/kde/kdesdk/okteta
@@ -26,6 +26,13 @@ Obsoletes:      kdesdk-okteta < 4.10.80
 Provides:       kdesdk-okteta = %{version}-%{release}
 %{?kde_runtime_requires}
 
+# struct2osd.sh deps
+%if 0%{?fedora} > 21
+Recommends: gccxml libxslt
+%else
+Requires: gccxml libxslt
+%endif
+
 %description
 Okteta is a binary/hex editor for KDE
 
@@ -33,9 +40,6 @@ 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}
-# struct2osd.sh deps (use Recommends?  -- rex )
-Requires: gccxml
-Requires: libxslt
 %description libs
 %{summary}.
 
@@ -111,6 +115,7 @@ 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
@@ -147,6 +152,9 @@ fi
 
 
 %changelog
+* 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
+
 * 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
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/okteta.git/commit/?h=master&id=5353018dda65d7f209eacdd963749b06f89a1b20


More information about the scm-commits mailing list