rdieter pushed to kde-baseapps (f20). "Merge branch 'f21' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 23 20:56:22 UTC 2015
>From 2ff76952beea9de553a6a4a0e73cf55e65819a93 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 10 Mar 2015 10:11:27 -0500
Subject: drop unused strigi/soprano build deps
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 7fc0820..a2d68ab 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -5,7 +5,7 @@
Name: kde-baseapps
Summary: KDE Core Applications
Version: 14.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and GFDL
URL: https://projects.kde.org/projects/kde/kde-baseapps
@@ -65,8 +65,6 @@ BuildRequires: libtidy-devel
%endif
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libstreams)
-BuildRequires: pkgconfig(soprano)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(zlib)
@@ -588,6 +586,9 @@ fi
%changelog
+* Tue Mar 10 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.3-2
+- drop unused strigi/soprano build deps
+
* Sun Mar 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 14.12.3-1
- 14.12.3
--
cgit v0.10.2
>From 94fde716ada2282f6cca9ed25246cccc3c49d237 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 11 Mar 2015 11:29:36 -0500
Subject: 14.12.3-3
- lower kfmclient_dir.desktop IntialPreference to 9, lower than dolphin 10 (f22+)
- omit kde-plasma-folderview (f22+)
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index a2d68ab..ba4b4c4 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -2,10 +2,14 @@
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
+%if 0%{?fedora} < 22
+%define folderview 1
+%endif
+
Name: kde-baseapps
Summary: KDE Core Applications
Version: 14.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and GFDL
URL: https://projects.kde.org/projects/kde/kde-baseapps
@@ -70,7 +74,9 @@ BuildRequires: pkgconfig(zlib)
Requires: %{name}-common = %{version}-%{release}
Requires: dolphin = %{version}-%{release}
+%if 0%{?folderview}
Requires: kde-plasma-folderview = 6:%{version}-%{release}
+%endif
Requires: kdepasswd = %{version}-%{release}
Requires: kdialog = %{version}-%{release}
Requires: keditbookmarks = %{version}-%{release}
@@ -91,11 +97,16 @@ kdialog : Nice dialog boxes from shell scripts
keditbookmarks : Bookmark organizer and editor
kfind : File find utility
konqueror : Web browser, file manager and document viewer
+%if 0%{?folderview}
plasma_applet_folderview : folderview plasma applet
+%endif
%package common
Summary: Common files for %{name}
Conflicts: kde-baseapps < 4.12.0-2
+%if ! 0%{?folderview}
+Obsoletes: kde-plasma-folderview < 6:%{version}-%{release}
+%endif
BuildArch: noarch
%description common
%{summary}
@@ -241,6 +252,16 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
%patch3 -p2 -b .kde#228593
%patch5 -p1 -b .konq_mimetype
+# not nice to change default in an update, so only do f22+ for now
+%if 0%{?fedora} > 21
+# lower konq priority to less than dolphin(10)
+sed -i -e 's|^InitialPreference=10|InitialPreference=9' konqueror/kfmclient_dir.desktop
+%endif
+
+%if ! 0%{?folderview}
+sed -i -e 's|^add_subdirectory(folderview)|#add_subdirectory(folderview)|g' plasma/applets/CMakeLists.txt
+%endif
+
%build
mkdir %{_target_platform}
@@ -580,12 +601,18 @@ fi
%{_kde4_iconsdir}/hicolor/*/apps/kfind.*
%{_datadir}/appdata/kfind.appdata.xml
+%if 0%{?folderview}
%files -n kde-plasma-folderview
%{_kde4_libdir}/kde4/plasma_applet_folderview.so
%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%endif
%changelog
+* Wed Mar 11 2015 Rex Dieter <rdieter at fedoraproject.org> - 14.12.3-3
+- lower kfmclient_dir.desktop IntialPreference to 9, lower than dolphin 10 (f22+)
+- omit kde-plasma-folderview (f22+)
+
* Tue Mar 10 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.3-2
- drop unused strigi/soprano build deps
--
cgit v0.10.2
>From 1d3f36dd10e328141eeba0653b167a021c142ddd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 11 Mar 2015 11:42:18 -0500
Subject: fix sed
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index ba4b4c4..716ebd5 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -255,7 +255,7 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
# not nice to change default in an update, so only do f22+ for now
%if 0%{?fedora} > 21
# lower konq priority to less than dolphin(10)
-sed -i -e 's|^InitialPreference=10|InitialPreference=9' konqueror/kfmclient_dir.desktop
+sed -i -e 's|^InitialPreference=10|InitialPreference=9|g' konqueror/kfmclient_dir.desktop
%endif
%if ! 0%{?folderview}
--
cgit v0.10.2
>From f84ef783fc0d6ffb523416fa48011a9605cb3df1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 14 Apr 2015 08:55:38 -0500
Subject: 15.04.0
diff --git a/.gitignore b/.gitignore
index 07ef1bb..300a007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/kde-baseapps-14.12.1.tar.xz
/kde-baseapps-14.12.2.tar.xz
/kde-baseapps-14.12.3.tar.xz
+/kde-baseapps-15.04.0.tar.xz
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 716ebd5..1f9817d 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -8,8 +8,8 @@
Name: kde-baseapps
Summary: KDE Core Applications
-Version: 14.12.3
-Release: 3%{?dist}
+Version: 15.04.0
+Release: 1%{?dist}
License: GPLv2 and GFDL
URL: https://projects.kde.org/projects/kde/kde-baseapps
@@ -609,6 +609,9 @@ fi
%changelog
+* Tue Apr 14 2015 Rex Dieter <rdieter at fedoraproject.org> - 15.04.0-1
+- 15.04.0
+
* Wed Mar 11 2015 Rex Dieter <rdieter at fedoraproject.org> - 14.12.3-3
- lower kfmclient_dir.desktop IntialPreference to 9, lower than dolphin 10 (f22+)
- omit kde-plasma-folderview (f22+)
diff --git a/sources b/sources
index 6e79dcb..d0bde23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe45c86a64f6f66b958d24b22848ba9f kde-baseapps-14.12.3.tar.xz
+e5531cb22bc11bb481d0ff75ed3411cf kde-baseapps-15.04.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kde-baseapps.git/commit/?h=f20&id=8d260abec67581fd18ec8b3ccdd17afed553c5ee
More information about the scm-commits
mailing list