diff --git a/.gitignore b/.gitignore index d9c2c98..720920a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /kde-baseapps-15.04.3.tar.xz -/kde-baseapps-15.08.0.tar.xz +/kde-baseapps-15.08.1.tar.xz diff --git a/kde-baseapps-15.08.0-set-cmake-minimum-required.patch b/kde-baseapps-15.08.0-set-cmake-minimum-required.patch deleted file mode 100644 index 772cf09..0000000 --- a/kde-baseapps-15.08.0-set-cmake-minimum-required.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b06ba01..e74a31d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,5 @@ -+cmake_minimum_required(VERSION 2.6) -+ - project(KDEBASE_APPS) - - # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff --git a/kde-baseapps.spec b/kde-baseapps.spec index 1adff55..cd9009f 100644 --- a/kde-baseapps.spec +++ b/kde-baseapps.spec @@ -11,8 +11,8 @@ Name: kde-baseapps Summary: KDE Core Applications -Version: 15.08.0 -Release: 2%{?dist} +Version: 15.08.1 +Release: 1%{?dist} License: GPLv2 and GFDL URL: https://projects.kde.org/projects/kde/kde-baseapps @@ -38,8 +38,6 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch # as default browser in GNOME Patch5: kde-baseapps-4.14.3-konq_mimetype.patch -Patch6: kde-baseapps-15.08.0-set-cmake-minimum-required.patch - ## upstream patches # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/ @@ -68,7 +66,7 @@ BuildRequires: kactivities-devel BuildRequires: kfilemetadata-devel >= 4.14 %endif BuildRequires: kdelibs4-devel >= 4.14 -%if 0%{?fedora} > 19 +%if 0%{?fedora} > 21 BuildRequires: libappstream-glib %endif %if 0%{?fedora} @@ -153,7 +151,6 @@ Obsoletes: d3lphin Requires: %{name}-common = %{version}-%{release} Requires: dolphin4-libs%{?_isa} = %{version}-%{release} Requires: kdialog = %{version}-%{release} -Requires: libkonq%{?_isa} = %{version}-%{release} Requires: konsole4-part # servicemenuinstallation %if 0%{?fedora} > 20 @@ -167,7 +164,7 @@ This package contains the default file manager of KDE. %package -n dolphin4-libs Summary: Dolphin runtime libraries -Requires: dolphin4 = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} %description -n dolphin4-libs %{summary}. @@ -213,7 +210,7 @@ Obsoletes: konq-plugins < 4.6.80-1 Provides: konq-plugins = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} # dolphinpart for embedded filemanagement -Requires: dolphin4 = %{version}-%{release} +Requires: dolphin4-libs%{?_isa} = %{version}-%{release} Requires: konqueror-libs%{?_isa} = %{version}-%{release} Requires: kdialog = %{version}-%{release} Requires: libkonq%{?_isa} = %{version}-%{release} @@ -269,7 +266,6 @@ Requires: libkonq%{?_isa} = %{version}-%{release} %patch2 -p2 -b .home-icon %patch3 -p2 -b .kde#228593 %patch5 -p1 -b .konq_mimetype -%patch6 -p1 -b .cmake # not nice to change default in an update, so only do f22+ for now %if 0%{?fedora} > 21 @@ -341,11 +337,13 @@ done %check %if 0%{?tests} export CTEST_OUTPUT_ON_FAILURE=1 -# setting semi-arbitrary 30 second timeout, KonqPopupMenuTest, seems to hang or take a really long time --rex +## setting semi-arbitrary 30 second timeout, KonqPopupMenuTest, seems to hang or take a really long time --rex time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ test ARGS="--output-on-failure --timeout 30" ||: %endif -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/kfind.appdata.xml ||: -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/konqueror.appdata.xml ||: +%if 0%{?fedora} > 21 +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/kfind.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/konqueror.appdata.xml +%endif for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do desktop-file-validate $f done @@ -393,9 +391,6 @@ fi %{_kde4_appsdir}/dolphin/ %{_kde4_libdir}/kde4/kcm_dolphin*.so %{_kde4_libdir}/kde4/kio_filenamesearch.so -%{_kde4_appsdir}/dolphinpart/ -%{_kde4_libdir}/kde4/dolphinpart.so -%{_kde4_datadir}/kde4/services/dolphinpart.desktop %{_kde4_configdir}/servicemenu.knsrc %{_kde4_datadir}/kde4/services/kcmdolphinnavigation.desktop %{_kde4_datadir}/kde4/services/filenamesearch.protocol @@ -403,15 +398,18 @@ fi %{_kde4_datadir}/kde4/services/kcmdolphinservices.desktop %{_kde4_datadir}/kde4/services/kcmdolphinviewmodes.desktop %{_kde4_datadir}/kde4/servicetypes/fileviewversioncontrolplugin.desktop -# stuff from konqueror/ source dir thats not konq-specific -%{_kde4_libdir}/kde4/kcm_kio.so -%{_kde4_datadir}/kde4/services/smb.desktop %post -n dolphin4-libs -p /sbin/ldconfig %postun -n dolphin4-libs -p /sbin/ldconfig %files -n dolphin4-libs %{_kde4_libdir}/libdolphinprivate4.so.4* +%{_kde4_appsdir}/dolphinpart/ +%{_kde4_libdir}/kde4/dolphinpart.so +%{_kde4_datadir}/kde4/services/dolphinpart.desktop +# stuff from konqueror/ source dir thats not konq-specific +%{_kde4_libdir}/kde4/kcm_kio.so +%{_kde4_datadir}/kde4/services/smb.desktop %post -n konqueror touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: @@ -629,6 +627,11 @@ fi %changelog +* Tue Sep 15 2015 Rex Dieter - 15.08.1-1 +- 15.08.1 +- dolphin4-libs: move dolphinpart here, drop dep on main pkg +- konqueror: Requires: dolphin4-libs (instead of dolphin4) + * Wed Sep 02 2015 Rex Dieter - 15.08.0-2 - konqueror: Home.desktop here - -libs: s/dolphin-libs/dolphin4-libs/ diff --git a/sources b/sources index 85946c4..98595b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1365964d1c20d353aacb022f5a1c4733 kde-baseapps-15.08.0.tar.xz +80d36d9aa14b9344bef9639c5a1a9f0a kde-baseapps-15.08.1.tar.xz