Accepting request 684446 from home:wolfi323:branches:KDE:Extra

- Update to 0.26.0
  * New: context menu available in byte array views, in the
    program, in the KParts plugin and and in the hex editing
    widgets from LibOktetaGui
  * New: qmake pri files and pkg-config pc files installed for the
    OktetaCore & OktetaGui libraries (_not_ for any Kasten ones)
  * Changed: ABI-breaking and software-incompatible clean-up of API
    and installed headers of the Okteta & Kasten libraries
  * Fixed: the metadata desktop file for the KParts plugin
    oktetapart is installed again, so it can be found and selected
    as viewer via its metadata
- Split out the libs and KParts plugin to separate packages as
  upstream recommends, move designer plugin to the devel package

OBS-URL: https://build.opensuse.org/request/show/684446
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/okteta?expand=0&rev=9

okteta-0.25.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9193ab0832551943ce26ee7bf97bf19397b76c94d4bff0cfaba9a6149870099
-size 953492

okteta-0.26.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ec42bcd926529e5b45d482ee12074af2f2ba44cebbe7f90a19f7c1d295dbb67
+size 969968

okteta.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Mar 12 06:25:43 UTC 2019 - wbauer@tmo.at
+
+- Update to 0.26.0
+  * New: context menu available in byte array views, in the
+    program, in the KParts plugin and and in the hex editing
+    widgets from LibOktetaGui
+  * New: qmake pri files and pkg-config pc files installed for the
+    OktetaCore & OktetaGui libraries (_not_ for any Kasten ones)
+  * Changed: ABI-breaking and software-incompatible clean-up of API
+    and installed headers of the Okteta & Kasten libraries
+  * Fixed: the metadata desktop file for the KParts plugin
+    oktetapart is installed again, so it can be found and selected
+    as viewer via its metadata
+- Split out the libs and KParts plugin to separate packages as
+  upstream recommends, move designer plugin to the devel package
+
 -------------------------------------------------------------------
 Mon Dec 31 09:00:23 UTC 2018 - wbauer@tmo.at
 

okteta.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package okteta
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,13 +12,15 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%define Kasten_sover 4
+%define Okteta_sover 3
 %bcond_without lang
 Name:           okteta
-Version:        0.25.5
+Version:        0.26.0
 Release:        0
 Summary:        Hex Editor
 License:        GPL-2.0-only AND GFDL-1.2-only
@@ -26,7 +28,7 @@ Group:          Development/Tools/Other
 URL:            https://www.kde.org/applications/utilities/okteta
 Source0:        https://download.kde.org/stable/okteta/%{version}/src/okteta-%{version}.tar.xz
 BuildRequires:  cmake
-BuildRequires:  extra-cmake-modules >= 5.38.0
+BuildRequires:  extra-cmake-modules >= 5.48.0
 BuildRequires:  kf5-filesystem
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5Bookmarks)
@@ -55,8 +57,6 @@ BuildRequires:  cmake(Qt5ScriptTools)
 BuildRequires:  cmake(Qt5UiPlugin)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
 Recommends:     %{name}-lang
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
@@ -64,18 +64,60 @@ Provides:       %{name}5 = %{version}
 %description
 Okteta is a hex editor for the raw data of files.
 
+%package data
+Summary:        Hex Editor data files
+Group:          Development/Tools/Other
+# the files were in the main package before
+Conflicts:      %{name} < 0.26
+BuildArch:      noarch
+
+%description data
+Data files used by Okteta/libKasten, e.g. structures definitions.
+
+%package part
+Summary:        Hex Editor KParts plugin
+Group:          Development/Tools/Other
+Recommends:     %{name}-part-lang
+
+%description part
+Hex editing component for KParts
+
+%package -n libKasten%{Kasten_sover}
+Summary:        High-level hex editor/viewer framework libraries
+Group:          Development/Tools/Other
+Requires:       %{name}-data
+Recommends:     libkasten-lang
+Provides:       libkasten = %{version}
+
+%description -n libKasten%{Kasten_sover}
+Kasten is a WIP higher-level framework for composable document-centric
+applications.
+
+%package -n libOkteta%{Okteta_sover}
+Summary:        Hex editor/viewer QWidgets libraries
+Group:          Development/Tools/Other
+Recommends:     libokteta-lang
+Provides:       libokteta = %{version}
+
+%description -n libOkteta%{Okteta_sover}
+Okteta libraries for QWidget-based hex editing widgets.
+
 %package devel
 Summary:        Development files for the Okteta Hex Editor
 Group:          Development/Tools/Other
-Requires:       %{name} = %{version}
+Requires:       libKasten%{Kasten_sover} = %{version}
+Requires:       libOkteta%{Okteta_sover} = %{version}
+# designer plugin was in the main package before
+Conflicts:      %{name} < 0.26
 Obsoletes:      %{name}5-devel
 
 %description devel
-Contains the development files for the Okteta Hex Editor
+Contains the development files for the Okteta Hex Editor.
 
-%if %{with lang}
 %lang_package
-%endif
+%lang_package -n %{name}-part
+%lang_package -n libkasten
+%lang_package -n libokteta
 
 %prep
 %setup -q
@@ -87,45 +129,74 @@ Contains the development files for the Okteta Hex Editor
 %install
   %kf5_makeinstall -C build
   %if %{with lang}
-    %find_lang %{name} --with-man --all-name
+    %find_lang okteta
+    %find_lang oktetapart
+    %find_lang liboktetacore libokteta.lang
+    %find_lang liboktetagui libokteta.lang
+    %find_lang libkasten libkasten.lang
+    %find_lang liboktetakasten libkasten.lang
     %{kf5_find_htmldocs}
   %endif
   %suse_update_desktop_file    org.kde.okteta         Utility Editor
 
-%post
+%post -n libKasten%{Kasten_sover} -p /sbin/ldconfig
-/sbin/ldconfig
+%postun -n libKasten%{Kasten_sover} -p /sbin/ldconfig
-%mime_database_post
+%post -n libOkteta%{Okteta_sover} -p /sbin/ldconfig
-
+%postun -n libOkteta%{Okteta_sover} -p /sbin/ldconfig
-%postun
-/sbin/ldconfig
-%mime_database_postun
 
 %files
 %license COPYING*
-%config %{_kf5_configdir}/okteta-structures.knsrc
 %doc %lang(en) %{_kf5_htmldir}/en/okteta/
 %{_kf5_applicationsdir}/org.kde.okteta.desktop
-%{_kf5_appstreamdir}/
+%{_kf5_appstreamdir}/org.kde.okteta.appdata.xml
 %{_kf5_bindir}/okteta
+%{_kf5_iconsdir}/hicolor/*/*/*.*
+
+%files data
+%license COPYING*
+%config %{_kf5_configdir}/okteta-structures.knsrc
 %{_kf5_bindir}/struct2osd
 %{_kf5_configkcfgdir}/
-%{_kf5_iconsdir}/hicolor/*/*/*.*
-%{_kf5_libdir}/libkasten*.so.*
-%{_kf5_libdir}/libokteta*.so.*
-%{_kf5_plugindir}/
 %{_kf5_sharedir}/mime/packages/okteta.xml
-%{_kf5_sharedir}/okteta*/
+%{_kf5_sharedir}/okteta/
+
+%files part
+%license COPYING*
+%{_kf5_plugindir}/kf5/
+%{_kf5_servicesdir}/oktetapart.desktop
+
+%files -n libKasten%{Kasten_sover}
+%license COPYING*
+%{_kf5_libdir}/libKasten%{Kasten_sover}*.so.*
+
+%files -n libOkteta%{Okteta_sover}
+%license COPYING*
+%{_kf5_libdir}/libOkteta%{Okteta_sover}*.so.*
 
 %files devel
 %license COPYING*
 %{_kf5_cmakedir}/
-%{_kf5_libdir}/libkasten*.so
+%{_kf5_libdir}/libKasten%{Kasten_sover}*.so
-%{_kf5_libdir}/libokteta*.so
+%{_kf5_libdir}/libOkteta%{Okteta_sover}*.so
 %{_kf5_prefix}/include/*/
+%{_kf5_mkspecsdir}/qt_OktetaCore.pri
+%{_kf5_mkspecsdir}/qt_OktetaGui.pri
+%{_kf5_libdir}/pkgconfig/OktetaCore.pc
+%{_kf5_libdir}/pkgconfig/OktetaGui.pc
+%{_kf5_plugindir}/designer/
 
 %if %{with lang}
 %files lang -f %{name}.lang
 %license COPYING*
+
+%files part-lang -f oktetapart.lang
+%license COPYING*
+
+%files -n libkasten-lang -f libkasten.lang
+%license COPYING*
+
+%files -n libokteta-lang -f libokteta.lang
+%license COPYING*
 %endif
 
 %changelog