diff --git a/.gitignore b/.gitignore index ef9231c..9d02e33 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /kde-baseapps-4.14.3.tar.xz +/kde-baseapps-14.11.97.tar.xz +/kde-baseapps-14.12.1.tar.xz diff --git a/kde-baseapps.spec b/kde-baseapps.spec index b683591..c8b209d 100644 --- a/kde-baseapps.spec +++ b/kde-baseapps.spec @@ -4,8 +4,8 @@ Name: kde-baseapps Summary: KDE Core Applications -Version: 4.14.3 -Release: 4%{?dist} +Version: 14.12.1 +Release: 1%{?dist} License: GPLv2 and GFDL URL: https://projects.kde.org/projects/kde/kde-baseapps @@ -15,7 +15,7 @@ URL: https://projects.kde.org/projects/kde/kde-baseapps %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/%{version}/src/kde-baseapps-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/applications/%{version}/src/kde-baseapps-%{version}.tar.xz ## upstreamable patches # search path for plugins @@ -51,12 +51,15 @@ Provides: kdebase = 6:%{version}-%{release} Obsoletes: kdebase4 < %{version}-%{release} Provides: kdebase4 = %{version}-%{release} -BuildRequires: baloo-devel >= %{version} -BuildRequires: baloo-widgets-devel >= %{version} +BuildRequires: baloo-devel >= 4.14 +BuildRequires: baloo-widgets-devel >= 4.14 BuildRequires: desktop-file-utils BuildRequires: kactivities-devel -BuildRequires: kfilemetadata-devel >= %{version} -BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: kfilemetadata-devel >= 4.14 +BuildRequires: kdelibs4-devel >= 4.14 +%if 0%{?fedora} > 19 +BuildRequires: libappstream-glib +%endif %if 0%{?fedora} BuildRequires: libtidy-devel %endif @@ -130,7 +133,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: dolphin-libs%{?_isa} = %{version}-%{release} Requires: kdialog = %{version}-%{release} Requires: libkonq%{?_isa} = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} %description -n dolphin This package contains the default file manager of KDE. @@ -143,14 +146,14 @@ Requires: dolphin = %{version}-%{release} %package -n kdepasswd Summary: Changes your UNIX password Requires: %{name}-common = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} %description -n kdepasswd This application allows you to change your UNIX password. %package -n kdialog Summary: Nice dialog boxes from shell scripts Requires: %{name}-common = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} %description -n kdialog KDialog can be used to show nice dialog boxes from shell scripts. @@ -158,7 +161,7 @@ KDialog can be used to show nice dialog boxes from shell scripts. Summary: Bookmark organizer and editor Requires: %{name}-common = %{version}-%{release} Requires: keditbookmarks-libs%{?_isa} = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} %description -n keditbookmarks %{summary}. @@ -171,7 +174,7 @@ Requires: keditbookmarks = %{version}-%{release} %package -n kfind Summary: KDE Find File Utility Requires: %{name}-common = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} %description -n kfind KFind allows you to search for directories and files. @@ -187,7 +190,7 @@ Requires: konqueror-libs%{?_isa} = %{version}-%{release} Requires: kdialog = %{version}-%{release} Requires: libkonq%{?_isa} = %{version}-%{release} #Requires: kwebkitpart -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%{?kde_runtime_requires} Requires: mozilla-filesystem %description -n konqueror Konqueror allows you to manage your files and browse the web in a @@ -210,7 +213,7 @@ Requires: kdelibs4-devel %package -n libkonq Summary: Libkonq shared resources Requires: %{name}-common = %{version}-%{release} -Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}} +%{?kdelibs4_requires} %description -n libkonq %{summary}. @@ -241,7 +244,7 @@ Requires: libkonq%{?_isa} = %{version}-%{release} %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd @@ -297,6 +300,8 @@ done %check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/kfind.appdata.xml ||: +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/konqueror.appdata.xml ||: for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do desktop-file-validate $f done @@ -489,6 +494,7 @@ fi %{_kde4_datadir}/kde4/services/proxy.desktop %{_kde4_datadir}/kde4/services/useragent.desktop %{_kde4_datadir}/kde4/services/webarchivethumbnail.desktop +%{_datadir}/appdata/konqueror.appdata.xml %post -n konqueror-libs -p /sbin/ldconfig %postun -n konqueror-libs -p /sbin/ldconfig @@ -573,6 +579,7 @@ fi %{_kde4_datadir}/applications/kde4/kfind.desktop %{_mandir}/man1/kfind.1.gz %{_kde4_iconsdir}/hicolor/*/apps/kfind.* +%{_datadir}/appdata/kfind.appdata.xml %files -n kde-plasma-folderview %{_kde4_libdir}/kde4/plasma_applet_folderview.so @@ -580,6 +587,12 @@ fi %changelog +* Sat Jan 17 2015 Rex Dieter - 14.12.1-1 +- 14.12.1 + +* Sat Dec 06 2014 Rex Dieter 14.11.97-1 +- 14.11.97 + * Mon Nov 17 2014 Rex Dieter 4.14.3-4 - add x-scheme-handler/http to kfmclient_html.desktop (kde#341055) diff --git a/sources b/sources index c2f04eb..898a027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20ffb374b03bdab5ee761b272f839fea kde-baseapps-4.14.3.tar.xz +f244da4093ebb8453279c1f4e3004f04 kde-baseapps-14.12.1.tar.xz