From 54f2455f0f5e3be09a870e7f2466eda4c1238fff54dc5c5906a6622dd58e450e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 11 May 2015 17:21:58 +0000 Subject: [PATCH] Accepting request 303589 from KDE:Applications Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/303589 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/okteta?expand=0&rev=25 --- okteta-15.04.0.tar.xz | 3 ++ okteta-4.14.3.tar.xz | 3 -- okteta.changes | 65 ++++++++++++++++++++++++++ okteta.spec | 103 +++++++++++++++++++++++------------------- 4 files changed, 124 insertions(+), 50 deletions(-) create mode 100644 okteta-15.04.0.tar.xz delete mode 100644 okteta-4.14.3.tar.xz diff --git a/okteta-15.04.0.tar.xz b/okteta-15.04.0.tar.xz new file mode 100644 index 0000000..129c2cf --- /dev/null +++ b/okteta-15.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82fc406754100fd1c8092456dac956ae81685431eb6761f3148c363490d76f6b +size 502716 diff --git a/okteta-4.14.3.tar.xz b/okteta-4.14.3.tar.xz deleted file mode 100644 index 53758b0..0000000 --- a/okteta-4.14.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd6e26be988778380128e4bda2dbb047074adffeb02819ee7665ad70f94cfaed -size 500424 diff --git a/okteta.changes b/okteta.changes index 2087c6b..6380654 100644 --- a/okteta.changes +++ b/okteta.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Sat Apr 11 13:56:11 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:59:42 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:59:41 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- +Tue Mar 3 10:50:46 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.3 + * KDE Applications 14.12.3 + * See https://www.kde.org/announcements/announce-applications-14.12.3.php + +------------------------------------------------------------------- +Sun Feb 1 11:27:02 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- +Mon Jan 12 20:17:07 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.1 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +------------------------------------------------------------------- +Wed Dec 17 20:44:21 UTC 2014 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 17 20:18:48 UTC 2014 - tittiatcoke@gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 3 08:14:10 UTC 2014 - tittiatcoke@gmail.com + +Update to KDE Applications 14.11.97 + * KDE Applications 14.12 Release Candidate + * See http://www.kde.org/announcements/announce-applications-14.12-rc.php + * Okteta is now KDE Frameworks based + ------------------------------------------------------------------- Sun Nov 9 21:13:35 UTC 2014 - tittiatcoke@gmail.com diff --git a/okteta.spec b/okteta.spec index 5a9aecc..04d9dc1 100644 --- a/okteta.spec +++ b/okteta.spec @@ -1,7 +1,7 @@ # # spec file for package okteta # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,34 @@ Name: okteta -BuildRequires: libkde4-devel -BuildRequires: libqca2-devel +BuildRequires: attica-qt5-devel +BuildRequires: cmake +BuildRequires: extra-cmake-modules +BuildRequires: fdupes +BuildRequires: kcmutils-devel +BuildRequires: kdoctools-devel +BuildRequires: kf5-filesystem +BuildRequires: knewstuff-devel +BuildRequires: kparts-devel +BuildRequires: kiconthemes-devel +BuildRequires: kdbusaddons-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5ScriptTools) +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +Obsoletes: okteta5 < %{version} Summary: Hex Editor License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 4.14.3 +Version: 15.04.0 Release: 0 -Source0: %{name}-%{version}.tar.xz +Source0: okteta-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Okteta is a hex editor for the KDE desktop. @@ -36,63 +53,55 @@ Okteta is a hex editor for the KDE desktop. Summary: Development files for the Okteta Hex Editor Group: Development/Tools/Other Requires: %{name} = %{version} +Obsoletes: okteta5-devel %description devel Contains the development files for the Okteta Hex Editor %prep -%setup -q -n %{name}-%{version} +%setup -q %build -%ifarch ppc64 -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" -%endif -export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" -export CFLAGS="$RPM_OPT_FLAGS -fPIC" - %cmake_kde4 -d build -- -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" - make + %cmake_kf5 -d build + %make_jobs %install - %kde4_makeinstall -C build - %suse_update_desktop_file okteta Utility Editor - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.okteta Utility Editor -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +%{_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : -%postun -p /sbin/ldconfig - -%clean - rm -rf $RPM_BUILD_ROOT +%postun +/sbin/ldconfig +%{_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : %files %defattr(-,root,root) -%doc COPYING COPYING.DOC README -%{_kde4_bindir}/okteta -%{_kde4_bindir}/struct2osd.sh -%{_kde4_appsdir}/oktetapart/ -%{_kde4_modulesdir}/libkbytearrayedit.so -%{_kde4_modulesdir}/oktetapart.so -%{_kde4_modulesdir}/plugins/designer/oktetadesignerplugin.so -%{_kde4_libdir}/libkasten2*.so.* -%{_kde4_libdir}/libokteta1*.so.* -%{_kde4_htmldir}/en/okteta/ -%{_kde4_iconsdir}/hicolor/*/apps/okteta.* -%{_kde4_appsdir}/okteta/ -%{_kde4_configkcfgdir}/structviewpreferences.kcfg -%{_kde4_configdir}/okteta-structures.knsrc -%{_kde4_servicesdir}/kbytearrayedit.desktop -%{_kde4_servicesdir}/oktetapart.desktop -%{_kde4_datadir}/mime/packages/okteta.xml -%{_kde4_applicationsdir}/okteta.desktop -%{_datadir}/appdata/okteta.appdata.xml +%{_kf5_bindir}/struct2osd +%{_kf5_bindir}/okteta +%{_kf5_sharedir}/mime/packages/okteta.xml +%{_kf5_applicationsdir}/org.kde.okteta.desktop +%config %{_kf5_configdir}/okteta-structures.knsrc +%{_kf5_sharedir}/icons/hicolor/*/*/*.* +%{_kf5_sharedir}/okteta*/ +%{_kf5_sharedir}/kxmlgui5/ +%{_kf5_sharedir}/appdata/ +%{_kf5_plugindir}/ +%{_kf5_libdir}/libkasten*.so.* +%{_kf5_libdir}/libokteta*.so.* +%{_kf5_configkcfgdir}/ +%dir %{_kf5_htmldir}/en +%dir %{_kf5_htmldir} +%doc %{_kf5_htmldir}/en/okteta/ %files devel %defattr(-,root,root) -%{_kde4_includedir}/KDE/Kasten2/ -%{_kde4_includedir}/KDE/Okteta1/ -%{_kde4_includedir}/kasten2/ -%{_kde4_includedir}/okteta1/ -%{_kde4_libdir}/libkasten2*.so -%{_kde4_libdir}/libokteta1*.so +%{_kf5_prefix}/include/*/ +%{_kf5_libdir}/libkasten*.so +%{_kf5_libdir}/libokteta*.so +%{_kf5_libdir}/cmake/ + %changelog