From c3a7afe14693b2c536a2afe9b5c2d976507b90ac117bc8d3c3c4cbce1a20bc47 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:21:24 +0000 Subject: [PATCH] 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}/