From c3a7afe14693b2c536a2afe9b5c2d976507b90ac117bc8d3c3c4cbce1a20bc47 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:21:24 +0000 Subject: [PATCH 1/7] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=17 --- konqueror-16.12.3.tar.xz | 3 --- konqueror-17.03.80.tar.xz | 3 +++ konqueror.changes | 14 ++++++++++++-- konqueror.spec | 39 +++++++++++++++++---------------------- 4 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 konqueror-16.12.3.tar.xz create mode 100644 konqueror-17.03.80.tar.xz diff --git a/konqueror-16.12.3.tar.xz b/konqueror-16.12.3.tar.xz deleted file mode 100644 index 57fddd7..0000000 --- a/konqueror-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e52654a1bb2c0be317f8ed80dba3147bc4d2126abce209ab57c6e69e64159bdf -size 1172012 diff --git a/konqueror-17.03.80.tar.xz b/konqueror-17.03.80.tar.xz new file mode 100644 index 0000000..9ccba60 --- /dev/null +++ b/konqueror-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3a58e816861091d16d0fac945b1d9ec328e8b5f05fd6659abfe80206b9598d8 +size 1170620 diff --git a/konqueror.changes b/konqueror.changes index 394de3a..c4b1513 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:37 CET 2017 - lbeltrame@kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Mar 9 12:40:04 CET 2017 - lbeltrame@kde.org @@ -21,14 +31,14 @@ Thu Feb 9 07:04:01 UTC 2017 - lbeltrame@kde.org Sat Jan 14 08:59:57 UTC 2017 - lbeltrame@kde.org - - Update to KDE Applications 16.12.1 - * KDE Applications 16.12.1 + * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Tue Dec 13 19:49:43 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 + * KDE Applications 16.12.0 * https://www.kde.org/announcements/announce-applications-16.12.0.php ------------------------------------------------------------------- diff --git a/konqueror.spec b/konqueror.spec index cd7490b..d2bfa42 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -17,10 +17,10 @@ Name: konqueror -Version: 16.12.3 +Version: 17.03.80 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} # It can only build on the same platforms as Qt Webengine ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 @@ -49,7 +49,6 @@ BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 -Requires: libKF5Konq6 = %{version} Recommends: kwebkitpart Obsoletes: kde-baseapps5-libkonq < %{version} Provides: kde-baseapps5-libkonq = %{version} @@ -58,18 +57,13 @@ Provides: kde-baseapps-libkonq = %{version} Obsoletes: %{name}-libkonq < %{version} Provides: %{name}-libkonq = %{version} Obsoletes: kdebase4-libkonq +Obsoletes: libKF5Konq6 < 17.04 +Provides: libKF5Konq6 = 17.04 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the libraries used by file managers as Konqueror. -%package -n libKF5Konq6 -Summary: KDE Konqueror Libraries -Group: System/GUI/KDE - -%description -n libKF5Konq6 -This package contains the libraries used by file managers as Konqueror. - %package -n webenginepart Summary: KDE Konqueror Libraries Group: System/GUI/KDE @@ -90,18 +84,21 @@ Provides: konqueror5-plugins = %{version} %description -n konqueror-plugins These plugins extend the functionality of Konqueror. -%package -n libkonq-devel +%package devel Summary: KDE Base Libraries -Group: System/GUI/KDE -Requires: libKF5Konq6 = %{version} +Group: Development/Libraries/KDE +Requires: %{name} = %{version} +Obsoletes: kdebase4-devel # FIXME 4.x variants of DBus interfaces need to go to devel package Obsoletes: kde-baseapps5-devel < %{version} Provides: kde-baseapps5-devel = %{version} Obsoletes: kde-baseapps-devel < %{version} Provides: kde-baseapps-devel = %{version} +Obsoletes: libkonq-devel < %{version} +Provides: libkonq-devel = %{version} -%description -n libkonq-devel -The development files for Konqueror and its libraries +%description devel +Development package for the konqueror libraries. %prep %setup -q @@ -120,20 +117,16 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n libKF5Konq6 -p /sbin/ldconfig -%postun -n libKF5Konq6 -p /sbin/ldconfig + %post -n konqueror-plugins -p /sbin/ldconfig %postun -n konqueror-plugins -p /sbin/ldconfig -%files -n libKF5Konq6 -%defattr(-,root,root) -%{_kf5_libdir}/libKF5Konq.so.* - %files %defattr(-,root,root) %{_kf5_libdir}/libkonquerorprivate.so.* %{_kf5_libdir}/libkdeinit5_konqueror.so %{_kf5_libdir}/libkdeinit5_kfmclient.so +%{_kf5_libdir}/libKF5Konq.so.* %{_kf5_bindir}/konqueror %{_kf5_bindir}/kfmclient %dir %{_kf5_configkcfgdir} @@ -163,6 +156,7 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %dir %{_kf5_sharedir}/kxmlgui5/konqueror %{_kf5_sharedir}/kxmlgui5/konqueror/konqueror.rc %{_kf5_applicationsdir}/kfmclient.desktop +%{_kf5_applicationsdir}/kfmclient_dir.desktop %{_kf5_applicationsdir}/kfmclient_html.desktop %{_kf5_applicationsdir}/kfmclient_war.desktop %{_kf5_applicationsdir}/Home.desktop @@ -241,8 +235,9 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %dir %{_kf5_sharedir}/dolphinpart %{_kf5_sharedir}/dolphinpart/kpartplugins/ -%files -n libkonq-devel +%files devel %defattr(-,root,root) +#doc COPYING* README %{_kf5_libdir}/cmake/KF5Konq/ %{_kf5_libdir}/libKF5Konq.so %{_kf5_includedir}/ From 02a8b711a9e6bc4f80f6a0440bd71ee97b04ea0e42cc8a407366423fbb115c3f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:53:27 +0000 Subject: [PATCH 2/7] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=18 --- konqueror-17.03.80.tar.xz | 3 --- konqueror-17.03.90.tar.xz | 3 +++ konqueror.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 konqueror-17.03.80.tar.xz create mode 100644 konqueror-17.03.90.tar.xz diff --git a/konqueror-17.03.80.tar.xz b/konqueror-17.03.80.tar.xz deleted file mode 100644 index 9ccba60..0000000 --- a/konqueror-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3a58e816861091d16d0fac945b1d9ec328e8b5f05fd6659abfe80206b9598d8 -size 1170620 diff --git a/konqueror-17.03.90.tar.xz b/konqueror-17.03.90.tar.xz new file mode 100644 index 0000000..151ffc7 --- /dev/null +++ b/konqueror-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4f9201c04f1a4578aa24297bc578c17e49e2f83b612c36bfd1c49ce008476b6 +size 7783128 diff --git a/konqueror.spec b/konqueror.spec index d2bfa42..9042a80 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -1,7 +1,7 @@ # # spec file for package konqueror # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products 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,7 +17,7 @@ Name: konqueror -Version: 17.03.80 +Version: 17.03.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 24283c40f93449342400867ba027682ad9908c6a3845eeb6b35908e8162356ce Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:44:58 +0000 Subject: [PATCH 3/7] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=19 --- konqueror.changes | 12 ++++++++++++ konqueror.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/konqueror.changes b/konqueror.changes index c4b1513..d004b9f 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Apr 12 20:25:48 CEST 2017 - lbeltrame@kde.org + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * Port kde4_add_app_icon to ecm_add_app_icon + * Save/restore window size + * Accept single line command options like we used to do + ------------------------------------------------------------------- Sat Mar 25 23:10:37 CET 2017 - lbeltrame@kde.org diff --git a/konqueror.spec b/konqueror.spec index 9042a80..ddb796d 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -1,7 +1,7 @@ # # spec file for package konqueror # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 From 4398919b5961d57663e7a1e8d68a7a11b8d84baf34d0295b243b3da758b4e34c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:28:35 +0000 Subject: [PATCH 4/7] Make a merry car great again OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=20 --- konqueror.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/konqueror.spec b/konqueror.spec index ddb796d..41e8cf9 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -16,6 +16,8 @@ # +%bcond_without lang + Name: konqueror Version: 17.03.90 Release: 0 @@ -100,6 +102,10 @@ Provides: libkonq-devel = %{version} %description devel Development package for the konqueror libraries. +%if %{with lang} +%lang_package +%endif + %prep %setup -q sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAKE_BINARY_DIR}|g' settings/konqhtml/CMakeLists.txt @@ -110,6 +116,10 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif find %{buildroot} -type f -name '*filenamesearch*' -exec rm -fv {} ';' # Needed by various other scripts, but disabled in git @@ -163,7 +173,7 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %{_kf5_applicationsdir}/konqbrowser.desktop %{_kf5_configdir}/autostart/konqy_preload.desktop %{_kf5_iconsdir}/hicolor/*/*/konqueror.* -%{_kf5_htmldir}/ +%{_kf5_htmldir}/en %dir %{_kf5_sharedir}/khtml %dir %{_kf5_sharedir}/khtml/kpartplugins %dir %{_kf5_sharedir}/kwebkitpart @@ -242,4 +252,9 @@ sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/css|${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAK %{_kf5_libdir}/libKF5Konq.so %{_kf5_includedir}/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From 80794241c047ad22c0b158c009590c1b010e05585e001ef2391df071ff8850e3 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 14:01:44 +0000 Subject: [PATCH 5/7] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=21 --- konqueror-17.03.90.tar.xz | 3 --- konqueror-17.04.0.tar.xz | 3 +++ konqueror.changes | 10 ++++++++++ konqueror.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 konqueror-17.03.90.tar.xz create mode 100644 konqueror-17.04.0.tar.xz diff --git a/konqueror-17.03.90.tar.xz b/konqueror-17.03.90.tar.xz deleted file mode 100644 index 151ffc7..0000000 --- a/konqueror-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4f9201c04f1a4578aa24297bc578c17e49e2f83b612c36bfd1c49ce008476b6 -size 7783128 diff --git a/konqueror-17.04.0.tar.xz b/konqueror-17.04.0.tar.xz new file mode 100644 index 0000000..7f329c6 --- /dev/null +++ b/konqueror-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95a6358da4cfd9589b66b78116adce29c0f69a5964e81fcde3862e32b1653833 +size 7783204 diff --git a/konqueror.changes b/konqueror.changes index d004b9f..2c57039 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:45:06 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * None + ------------------------------------------------------------------- Wed Apr 12 20:25:48 CEST 2017 - lbeltrame@kde.org diff --git a/konqueror.spec b/konqueror.spec index 41e8cf9..3bbc447 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: konqueror -Version: 17.03.90 +Version: 17.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 4da5bc7b73f4289b6bfef2a39f92fac9c3433d9e83d49db8bba8187e3183841f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 19:27:17 +0000 Subject: [PATCH 6/7] Remove URL OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=22 --- konqueror.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/konqueror.spec b/konqueror.spec index 3bbc447..97fd39b 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -29,7 +29,6 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 Summary: KDE Konqueror Libraries License: GPL-2.0+ Group: System/GUI/KDE -Url: http://www.kde.org/ Source: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kactivities5-devel >= 5.7.0 From 44e9c78f8de0b99b96cda98bea5926d56fe0a7da6686473e68f632d6067ed6ad Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:49:35 +0000 Subject: [PATCH 7/7] Add Recommends: %{name}-lang OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=23 --- konqueror.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/konqueror.spec b/konqueror.spec index 97fd39b..d06c012 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -60,6 +60,7 @@ Provides: %{name}-libkonq = %{version} Obsoletes: kdebase4-libkonq Obsoletes: libKF5Konq6 < 17.04 Provides: libKF5Konq6 = 17.04 +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description