From 42415ede4d4edc9902cf973edfc629f98e969cd057ecda2a0fbfdd2f5d5fcdb3 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 9 May 2024 08:25:09 +0000 Subject: [PATCH] Update to 2.5.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kgraphviewer?expand=0&rev=17 --- kgraphviewer-2.4.3.tar.xz | 3 - kgraphviewer-2.5.0.tar.xz | 3 + kgraphviewer-2.5.0.tar.xz.sig | 16 +++++ kgraphviewer.changes | 8 +++ kgraphviewer.keyring | Bin 0 -> 3445 bytes kgraphviewer.spec | 128 ++++++++++++++++------------------ 6 files changed, 89 insertions(+), 69 deletions(-) delete mode 100644 kgraphviewer-2.4.3.tar.xz create mode 100644 kgraphviewer-2.5.0.tar.xz create mode 100644 kgraphviewer-2.5.0.tar.xz.sig create mode 100644 kgraphviewer.keyring diff --git a/kgraphviewer-2.4.3.tar.xz b/kgraphviewer-2.4.3.tar.xz deleted file mode 100644 index 6ceb5e5..0000000 --- a/kgraphviewer-2.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54e0c218453912ea82ad9a96edfb2d4dfd8cb15f6a567ef843b4ef97d07bd7c0 -size 1491328 diff --git a/kgraphviewer-2.5.0.tar.xz b/kgraphviewer-2.5.0.tar.xz new file mode 100644 index 0000000..107f18b --- /dev/null +++ b/kgraphviewer-2.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872bee63fb4df6f7fb2b4eaf02ff825cba3ca953ac02509a287fe5cd0f1e2b69 +size 1571364 diff --git a/kgraphviewer-2.5.0.tar.xz.sig b/kgraphviewer-2.5.0.tar.xz.sig new file mode 100644 index 0000000..e8e0f5d --- /dev/null +++ b/kgraphviewer-2.5.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmY7nTAACgkQu0YzUNbv +Me9eoA//Z1fQpateOcnCG6xUEQGuZP6Cay7FhHG2mZOVKdbnUxfPOr0k5iEEwoFP ++8awuYdXBiuOH716ZYp3tNUZnrHxATI7xRAVeh4Mz68s5sTslYQeaQA/YkX3aJ2z +AfOOGNJy5QnX9DIAi3yK6YIacZSLbnAH67woaAZuVTOSR2ZVa9yAfLHQoBmi4SsP +yGNMCDud4MCVcp6cANjvNoX+VHY6u4rEym3A3maX93uib464yjD0WjStS23ef2od +Fhpqr7fOl5f6DERQfhmVoyC4OnA5440BEP7TQUSyQM4DsUk5pkb7KZM7+h0b76zf +17Ene4KXbgMRgESPwNSAmJeFhlghRYi/rTHl8JrU9CRkxDpEFDi1gm8W195tlv87 +buG0pysUskPBr1gxrEe9DWozWBicETcKvBw60ABEqE+c03OEp7J3qXZZyOQ2Pmqo +VtoPxdmiLpSpNDXvs1bevRev8kjakWl9gFZ1UpO4CYQ0/vG5XY103F3aqTcJQCYF +xBsy9ZikNk1XJBvPGzRRaMGJ+DA6+nimFUKs25gQ9ccl5nBCk8RponxGO2PztbM7 +OVnBKIUyDbsBj9trru6Zjtx8iYgmHJTUNjSO1UC4Ff6juh8dD4iSbgaG0He4pI+0 +XfAlRJsVA+/Iq1vTV4FmnML8j4qTe99CogB7ra+EveVDjlPWfDo= +=reUT +-----END PGP SIGNATURE----- diff --git a/kgraphviewer.changes b/kgraphviewer.changes index 0212899..f7fc19e 100644 --- a/kgraphviewer.changes +++ b/kgraphviewer.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 9 08:23:56 UTC 2024 - Christophe Marin + +- Update to 2.5.0: + https://blogs.kde.org/2024/05/08/kgraphviewer-2.5.0-released/ + * Port to Qt6 and KF6 + * General code modernization + ------------------------------------------------------------------- Fri Dec 15 22:07:35 UTC 2023 - Christophe Marin diff --git a/kgraphviewer.keyring b/kgraphviewer.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6e25bdebc641965b5c457a3e857ec5f81ca97a5a7214a229d3049001199a36c4 GIT binary patch literal 3445 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 literal 0 HcmV?d00001 diff --git a/kgraphviewer.spec b/kgraphviewer.spec index 13d96f1..88a6dcc 100644 --- a/kgraphviewer.spec +++ b/kgraphviewer.spec @@ -1,7 +1,7 @@ # # spec file for package kgraphviewer # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,56 +16,59 @@ # -%define soname 3 +%define kf6_version 6.0.0 +%define qt6_version 6.5.0 + +%bcond_without released Name: kgraphviewer -Version: 2.4.3 +Version: 2.5.0 Release: 0 Summary: Graphviz dot graph file viewer License: GPL-2.0-only -Group: Development/Tools/Other -URL: https://www.kde.org/applications/graphics/kgraphviewer/ -Source: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz +URL: https://apps.kde.org/kgraphviewer +Source: https://download.kde.org/stable/kgraphviewer/%{version}/%{name}-%{version}.tar.xz +%if %{with released} +Source1: https://download.kde.org/stable/kgraphviewer/%{version}/%{name}-%{version}.tar.xz.sig +Source2: kgraphviewer.keyring +%endif BuildRequires: boost-devel -BuildRequires: extra-cmake-modules -BuildRequires: graphviz-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdoctools-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kparts-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: graphviz-devel >= 2.30 +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6Parts) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} Requires: graphviz -Requires: libkgraphviewer%{soname} = %{version} -Recommends: %{name}-lang %description -KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other outdated Graphviz tools. -Graphs are commonly used in scientific domains and particularly in computer science. +KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other +outdated Graphviz tools. Graphs are commonly used in scientific domains and +particularly in computer science. -%package -n libkgraphviewer%{soname} +%package -n libkgraphviewer0 Summary: Graphviz dot graph file viewer -Group: Development/Tools/Other -Suggests: kgraphviewer = %{version} -%description -n libkgraphviewer%{soname} -KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other outdated Graphviz tools. -Graphs are commonly used in scientific domains and particularly in computer science. +%description -n libkgraphviewer0 +KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other +outdated Graphviz tools. Graphs are commonly used in scientific domains and +particularly in computer science. + +This package install the kgraphviewer library. %package -n kgraphviewer-devel -Summary: Graphviz dot graph file viewer -Group: Development/Tools/Other +Summary: Development files for kgraphviewer Requires: kgraphviewer = %{version} -Requires: libkgraphviewer%{soname} = %{version} +Requires: libkgraphviewer0 = %{version} %description -n kgraphviewer-devel -KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other outdated Graphviz tools. -Graphs are commonly used in scientific domains and particularly in computer science. +Development files for kgraphviewer. %lang_package @@ -73,44 +76,37 @@ Graphs are commonly used in scientific domains and particularly in computer scie %autosetup -p1 %build -%cmake_kf5 -d build -%make_jobs +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang kgraphviewer %{name}.lang -%{kf5_find_htmldocs} +%find_lang kgraphviewer --with-html kgraphviewer.lang -%post -n libkgraphviewer%{soname} -p /sbin/ldconfig -%postun -n libkgraphviewer%{soname} -p /sbin/ldconfig - -%files -n kgraphviewer-devel -%{_includedir}/* -%{_kf5_cmakedir}/KGraphViewerPart -%{_kf5_libdir}/libkgraphviewer.so - -%files -n libkgraphviewer%{soname} -%{_kf5_libdir}/libkgraphviewer.so.* - -%files lang -f %{name}.lang +%ldconfig_scriptlets -n libkgraphviewer0 %files %license COPYING COPYING.DOC %doc AUTHORS -%dir %{_kf5_configkcfgdir} -%{_kf5_debugdir}/kgraphviewer.categories -%{_kf5_applicationsdir}/org.kde.kgraphviewer.desktop -%{_kf5_kxmlguidir}/kgraphviewer -%{_kf5_sharedir}/kgraphviewerpart -%{_kf5_bindir}/* -%{_kf5_configkcfgdir}/kgraphviewer_partsettings.kcfg -%{_kf5_configkcfgdir}/kgraphviewersettings.kcfg -%{_kf5_appstreamdir}/org.kde.kgraphviewer.appdata.xml -%{_kf5_appstreamdir}/org.kde.libkgraphviewer.metainfo.xml -%{_kf5_iconsdir}/* -%{_kf5_plugindir}/kgraphviewerpart.so -%{_kf5_servicesdir}/kgraphviewer_part.desktop -%doc %lang(en) %{_kf5_htmldir}/en/kgraphviewer +%doc %lang(en) %{_kf6_htmldir}/en/kgraphviewer +%{_kf6_applicationsdir}/org.kde.kgraphviewer.desktop +%{_kf6_appstreamdir}/org.kde.kgraphviewer.appdata.xml +%{_kf6_bindir}/kgraphviewer +%{_kf6_configkcfgdir}/kgraphviewersettings.kcfg +%{_kf6_debugdir}/kgraphviewer.categories +%{_kf6_iconsdir}/hicolor/apps/*/kgraphviewer.png + +%files -n libkgraphviewer0 +%{_kf6_libdir}/libkgraphviewer.so.* + +%files -n kgraphviewer-devel +%{_includedir}/kgraphviewer/ +%{_kf6_cmakedir}/KGraphViewerPart/ +%{_kf6_libdir}/libkgraphviewer.so + +%files lang -f kgraphviewer.lang +%exclude %{_kf6_htmldir}/en/kgraphviewer %changelog