From 1d302659759db54e8f458b62df0b8882c935546944692f0ebbb8f3ce5701608d Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:44:00 +0000 Subject: [PATCH] KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=154 --- dolphin-18.08.3.tar.xz | 3 --- dolphin-18.11.80.tar.xz | 3 +++ dolphin.changes | 15 ++++++++++++++ dolphin.spec | 46 ++++++++++++++++++++--------------------- 4 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 dolphin-18.08.3.tar.xz create mode 100644 dolphin-18.11.80.tar.xz diff --git a/dolphin-18.08.3.tar.xz b/dolphin-18.08.3.tar.xz deleted file mode 100644 index 9188120..0000000 --- a/dolphin-18.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bb4560979f8b3fe970bfdebea51b784cc3088ee4c3919bc5d9bf5eb5dfd916c -size 4859384 diff --git a/dolphin-18.11.80.tar.xz b/dolphin-18.11.80.tar.xz new file mode 100644 index 0000000..6a7f636 --- /dev/null +++ b/dolphin-18.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e51ac8f76a041df3173525d3a65b96cc2e2257ead180d1362a91501bbf89dcc +size 4864396 diff --git a/dolphin.changes b/dolphin.changes index a871870..2cb159a 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 20 06:21:52 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:56:37 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.11.80.php +- Changes since 18.08.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Nov 08 20:43:27 UTC 2018 - lbeltrame@kde.org diff --git a/dolphin.spec b/dolphin.spec index 9dc8566..847de76 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -16,18 +16,17 @@ # -%bcond_without lang - -Name: dolphin -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: dolphin +Version: 18.11.80 +Release: 0 Summary: KDE File Manager License: GPL-2.0-or-later Group: Productivity/File utilities -Url: http://www.kde.org +URL: http://www.kde.org Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff @@ -64,12 +63,11 @@ BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -Obsoletes: dolphin5 -Recommends: kio-extras5 -Recommends: konsole-part Requires: baloo5-kioslaves Requires: dolphin-part = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: kio-extras5 +Recommends: konsole-part +Obsoletes: dolphin5 %description This package contains the default file manager of KDE Workspaces. @@ -77,9 +75,9 @@ This package contains the default file manager of KDE Workspaces. %package part Summary: KDE File Manager Group: Productivity/File utilities -Obsoletes: dolphin5-part +%requires_ge kio Recommends: %{name}-part-lang -%requires_ge kio +Obsoletes: dolphin5-part %description part This package contains the libraries used by Dolphin and Konqueror. @@ -106,11 +104,10 @@ This package contains the libraries used by Dolphin and Konqueror. Summary: Translations for package %{name} Group: System/Localization Requires: %{name}-part = %{version} +Supplements: packageand(bundle-lang-other:%{name}-part) Provides: %{name}-lang = %{version} Obsoletes: %{name}-lang < %{version} - Provides: %{name}-part-lang-all = %{version} -Supplements: packageand(bundle-lang-other:%{name}-part) BuildArch: noarch %description -n %{name}-part-lang @@ -130,7 +127,7 @@ Provides translations for the "%{name}" package. %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif install -D -m 0644 %{SOURCE1} %{buildroot}%{_kf5_applicationsdir}/org.kde.dolphinsu.desktop @@ -144,8 +141,8 @@ Provides translations for the "%{name}" package. %postun -n libdolphinvcs5 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* README +%license COPYING* +%doc README %dir %{_kf5_appstreamdir} %dir %{_kf5_htmldir} %dir %{_kf5_htmldir}/en @@ -161,8 +158,8 @@ Provides translations for the "%{name}" package. %{_kf5_sharedir}/dbus-1/services/org.kde.dolphin.FileManager1.service %files part -%defattr(-,root,root) -%doc COPYING* README +%license COPYING* +%doc README %config %{_kf5_configdir}/servicemenu.knsrc %dir %{_kf5_configkcfgdir} %dir %{_kf5_plugindir} @@ -179,15 +176,16 @@ Provides translations for the "%{name}" package. %{_kf5_servicesdir}/kcmdolphinviewmodes.desktop %{_kf5_servicetypesdir}/fileviewversioncontrolplugin.desktop #{_kf5_sharedir}/dolphinpart/ +%{_kf5_debugdir}/dolphin.categories %files -n libdolphinvcs5 -%defattr(-,root,root) -%doc COPYING* README +%license COPYING* +%doc README %{_kf5_libdir}/libdolphinvcs.so.* %files devel -%defattr(-,root,root) -%doc COPYING* README +%license COPYING* +%doc README %{_includedir}/dolphinvcs_export.h %{_kf5_cmakedir}/DolphinVcs/ %{_kf5_libdir}/libdolphinvcs.so @@ -196,7 +194,7 @@ Provides translations for the "%{name}" package. %if %{with lang} %files part-lang -f %{name}.lang -%doc COPYING* +%license COPYING* %dir %{_kf5_sharedir}/locale/fi/LC_SCRIPTS/ %lang(fi) %{_kf5_sharedir}/locale/fi/LC_SCRIPTS/dolphin/ %endif