rdieter pushed to okteta (master). "kf5 okteta"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 6 17:58:02 UTC 2015
>From b6158384889816ef53318943de7e60f97e925a1d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 6 Apr 2015 12:57:49 -0500
Subject: kf5 okteta
diff --git a/.gitignore b/.gitignore
index a03007f..8499f72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/okteta-4.14.3.tar.xz
+/okteta-14.12.3.tar.xz
diff --git a/okteta.spec b/okteta.spec
index c757533..0a3be4c 100644
--- a/okteta.spec
+++ b/okteta.spec
@@ -1,7 +1,7 @@
Name: okteta
Summary: Binary/hex editor
-Version: 4.14.3
-Release: 8%{?dist}
+Version: 14.12.3
+Release: 1%{?dist}
License: GPLv2+ and GFDL
URL: https://projects.kde.org/projects/kde/kdesdk/okteta
@@ -11,28 +11,45 @@ URL: https://projects.kde.org/projects/kde/kdesdk/okteta
%else
%global stable stable
%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
+Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
+
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kbookmarks-devel
+BuildRequires: kf5-kcodecs-devel
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kcmutils-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kparts-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(qca2-qt5)
+BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5ScriptTools)
+BuildRequires: pkgconfig(Qt5Test)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Xml)
%if 0%{?fedora} > 19
BuildRequires: libappstream-glib
%endif
-BuildRequires: pkgconfig(qca2)
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Conflicts: kdesdk-common < 4.10.80
Obsoletes: kdesdk-okteta < 4.10.80
Provides: kdesdk-okteta = %{version}-%{release}
-%{?kde_runtime_requires}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# struct2osd.sh deps
%if 0%{?fedora} > 20
Recommends: gccxml libxslt
@@ -47,115 +64,101 @@ Okteta is a binary/hex editor for KDE
Summary: Runtime libraries and kpart plugins for %{name}
Obsoletes: kdesdk-okteta-libs < 4.10.80
Provides: kdesdk-okteta-libs = %{version}-%{release}
-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
+Provides: okteta5-part = %{version}-%{release}
+Provides: okteta5-part%{?_isa} = %{version}-%{release}
%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: okteta5-devel = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
%{summary}.
%prep
-%setup -q -n okteta-%{version}
+%setup -q
%build
mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
popd
-for i in %{?components} ; do
-make %{?_smp_mflags} -C %{_target_platform}/$i/
-done
+make %{?_smp_mflags} -C %{_target_platform}
%install
-for i in %{?components} ; do
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/$i/
-done
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%if "%{name}" == "okteta"
-%find_lang okteta --with-kde --without-mo
+# fix permissions
+chmod a+rx %{buildroot}%{_kde4_bindir}/struct2osd.sh
%check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/okteta.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okteta.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/okteta.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.desktop
%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
touch --no-create %{_kde4_datadir}/mime ||:
%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_datadir}/icons/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 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+touch --no-create %{_datadir}/mime ||:
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
-%files -f okteta.lang
+%files
%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
+%{_bindir}/okteta
+%{_bindir}/struct2osd.sh
+%{_datadir}/mime/packages/okteta.xml
+%{_datadir}/applications/org.kde.okteta.desktop
+%{_datadir}/kxmlgui5/okteta/
+%{_datadir}/icons/hicolor/*/apps/okteta.*
+%{_datadir}/appdata/okteta.appdata.xml
+%{_docdir}/HTML/en/okteta/
%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
-%{_kde4_datadir}/config/okteta-structures.knsrc
-%{_kde4_datadir}/config.kcfg/structviewpreferences.kcfg
-%{_kde4_libdir}/libkasten*.so.*
-%{_kde4_libdir}/libokteta*.so.*
-%{_kde4_libdir}/kde4/plugins/designer/oktetadesignerplugin.so
+%dir %{_datadir}/okteta/
+%{_datadir}/okteta/structures/
+%{_sysconfdir}/xdg/okteta-structures.knsrc
+%{_datadir}/config.kcfg/structviewpreferences.kcfg
+%{_libdir}/libkasten*.so.*
+%{_libdir}/libokteta*.so.*
+%{_qt5_plugindir}/designer/oktetadesignerplugin.so
# part
-%{_kde4_appsdir}/oktetapart/
-%{_kde4_libdir}/kde4/oktetapart.so
-%{_kde4_datadir}/kde4/services/oktetapart.desktop
-%{_kde4_libdir}/kde4/libkbytearrayedit.so
-%{_kde4_datadir}/kde4/services/kbytearrayedit.desktop
+%{_datadir}/oktetapart/
+%{_qt5_plugindir}/oktetapart.so
%files devel
-%{_kde4_includedir}/KDE/Okteta*/
-%{_kde4_includedir}/okteta*/
-%{_kde4_libdir}/libokteta*.so
-%{_kde4_includedir}/KDE/Kasten*/
-%{_kde4_includedir}/kasten*/
-%{_kde4_libdir}/libkasten*.so
+%{_includedir}/Okteta/
+%{_includedir}/okteta/
+%{_libdir}/libokteta*.so
+%{_includedir}/Kasten/
+%{_includedir}/kasten/
+%{_libdir}/libkasten*.so
%changelog
+* Mon Apr 06 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.3-1
+- kf5 okteta
+
* 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
diff --git a/sources b/sources
index b400817..d1929ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a75d083a3f5ad5b6473648b43031d27 okteta-4.14.3.tar.xz
+063519eccc950310ce6bfca9cf017502 okteta-14.12.3.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/okteta.git/commit/?h=master&id=b6158384889816ef53318943de7e60f97e925a1d
More information about the scm-commits
mailing list