From c947bf88a41db5ed5636b3fdc3df725ea9ef058a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 11 2018 20:11:54 +0000 Subject: okteta-0.25.0 (epoch++) use %make_build %ldconfig_scriptlets --- diff --git a/.gitignore b/.gitignore index 7efc8c0..64b8711 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /okteta-17.12.1.tar.xz /okteta-17.12.2.tar.xz /okteta-17.12.3.tar.xz +/okteta-0.25.0.tar.xz diff --git a/okteta.spec b/okteta.spec index 4b34287..ff8fea3 100644 --- a/okteta.spec +++ b/okteta.spec @@ -1,6 +1,7 @@ Name: okteta Summary: Binary/hex editor -Version: 17.12.3 +Epoch: 1 +Version: 0.25.0 Release: 1%{?dist} License: GPLv2+ and GFDL @@ -12,7 +13,7 @@ URL: https://cgit.kde.org/%{name}.git %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/okteta/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: desktop-file-utils BuildRequires: gettext @@ -54,9 +55,9 @@ Conflicts: kde-l10n < 17.03 Conflicts: kdesdk-common < 4.10.80 Obsoletes: kdesdk-okteta < 4.10.80 -Provides: kdesdk-okteta = %{version}-%{release} +Provides: kdesdk-okteta = %{epoch}:%{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} # struct2osd.sh deps %if 0%{?fedora} > 20 Recommends: gccxml libxslt @@ -69,21 +70,19 @@ Okteta is a binary/hex editor for KDE %package libs Summary: Runtime libraries and kpart plugins for %{name} -# %%{_datadir}/config.kcfg/structviewpreferences.kcfg conflict -Conflicts: okteta4-libs < 4.14.3-56 Obsoletes: kdesdk-okteta-libs < 4.10.80 -Provides: kdesdk-okteta-libs = %{version}-%{release} -Provides: okteta5-part = %{version}-%{release} -Provides: okteta5-part%{?_isa} = %{version}-%{release} +Provides: kdesdk-okteta-libs = %{epoch}:%{version}-%{release} +Provides: okteta5-part = %{epoch}:%{version}-%{release} +Provides: okteta5-part%{?_isa} = %{epoch}:%{version}-%{release} %description libs %{summary}. %package devel Summary: Developer files for %{name} Obsoletes: kdesdk-okteta-devel < 4.10.80 -Provides: kdesdk-okteta-devel = %{version}-%{release} -Provides: okteta5-devel = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Provides: kdesdk-okteta-devel = %{epoch}:%{version}-%{release} +Provides: okteta5-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. @@ -98,7 +97,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -111,6 +110,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.okteta.appdata.xml ||: desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.desktop + %files -f %{name}.lang %doc README %license COPYING* @@ -119,23 +119,22 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.deskto %{_datadir}/mime/packages/okteta.xml %{_kf5_metainfodir}/org.kde.okteta.appdata.xml %{_datadir}/applications/org.kde.okteta.desktop -%{_datadir}/kxmlgui5/okteta/ +#{_datadir}/kxmlgui5/okteta/ %{_datadir}/icons/hicolor/*/apps/okteta.* -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files libs %dir %{_datadir}/okteta/ %{_datadir}/okteta/structures/ %{_sysconfdir}/xdg/okteta-structures.knsrc -%{_datadir}/config.kcfg/structviewpreferences.kcfg +%{_datadir}/config.kcfg/structureviewpreferences.kcfg %{_libdir}/libkasten*.so.* %{_libdir}/libokteta*.so.* %{_qt5_plugindir}/designer/oktetawidgets.so # part %{_qt5_plugindir}/oktetapart.so -%{_kf5_datadir}/kxmlgui5/oktetapart/ +#{_kf5_datadir}/kxmlgui5/oktetapart/ %files devel %{_includedir}/Okteta/ @@ -155,6 +154,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.deskto %changelog +* Mon Jun 11 2018 Rex Dieter - 1:0.25.0-1 +- okteta-0.25.0 (epoch++) +- use %%make_build %%ldconfig_scriptlets + * Tue Mar 06 2018 Rex Dieter - 17.12.3-1 - 17.12.3 diff --git a/sources b/sources index 5d95d84..fd0bd11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (okteta-17.12.3.tar.xz) = d89bcd46001336d912f2d3f08247cdb13a02688316f078455e851feae03b638688683df2779c19089481b69baa2a582fd063d3180ebe66962ab249fc39c3850d +SHA512 (okteta-0.25.0.tar.xz) = 651a6d01833427df6ad7cb5d5e319fcc46113a214189702574647e87921d97db5381f2e5e797c3d8b7f1ba314eac6334aef738e648e82d9c1c9198144152a90c