rdieter pushed to okteta (master). "Revert "drop struct2osd.sh" (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 18:41:09 UTC 2015


>From 4477ebcc67258933993a3447cc3bcfc081f257c2 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at gmail.com>
Date: Tue, 14 Apr 2015 13:36:11 -0500
Subject: Revert "drop struct2osd.sh"

This reverts commit 2b82fb4f3363675ebca51d7dc9f59b58306e2e46.

diff --git a/okteta.spec b/okteta.spec
index bcac2eb..5f8f821 100644
--- a/okteta.spec
+++ b/okteta.spec
@@ -50,6 +50,12 @@ Obsoletes:      kdesdk-okteta < 4.10.80
 Provides:       kdesdk-okteta = %{version}-%{release}
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+# struct2osd.sh deps
+%if 0%{?fedora} > 20
+Recommends: gccxml libxslt
+%else
+Requires: gccxml libxslt
+%endif
 
 %description
 Okteta is a binary/hex editor for KDE
@@ -89,6 +95,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# fix permissions
+chmod a+rx %{buildroot}%{_bindir}/struct2osd.sh
+
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/okteta.appdata.xml ||:
@@ -114,6 +123,7 @@ fi
 %files
 %doc COPYING* README
 %{_bindir}/okteta
+%{_bindir}/struct2osd.sh
 %{_datadir}/mime/packages/okteta.xml
 %{_datadir}/applications/org.kde.okteta.desktop
 %{_datadir}/kxmlgui5/okteta/
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list