[cinnamon/f17] filter provides and requires
leigh123linux
leigh123linux at fedoraproject.org
Fri Jul 20 17:56:53 UTC 2012
commit 11a66b8642bc3de46407522cd7655851453627d6
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Fri Jul 20 18:56:48 2012 +0100
filter provides and requires
- Remove requires dbus-x11
- Add -p to install
cinnamon.spec | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index a1ac2be..9d45fe8 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,5 +1,11 @@
%global _internal_version 7959517
+%{?filter_setup:
+%filter_from_provides /^libcinnamon.so/d;
+%filter_from_requires /^libcinnamon.so/d;
+%filter_setup
+}
+
Name: cinnamon
Version: 1.4.1
Release: 0.7.git%{_internal_version}%{?dist}
@@ -97,7 +103,6 @@ Requires: caribou%{?_isa}
# needed for settings
Requires: pygobject2
Requires: dbus-python
-Requires: dbus-x11
%description
Cinnamon is a Linux desktop which provides advanced
@@ -133,11 +138,11 @@ sed -i -e 's@/usr/lib@/usr/share at g' files%{_bindir}/cinnamon-menu-editor \
rm -f files%{_bindir}/gnome-session-cinnamon \
files%{_datadir}/xsessions/cinnamon*.desktop \
files%{_datadir}/gnome-session/sessions/cinnamon*.session
-install -m 644 %SOURCE1 %SOURCE3 files%{_datadir}/xsessions/
-install -m 644 %SOURCE2 %SOURCE4 files%{_datadir}/gnome-session/sessions/
+install -pm 644 %SOURCE1 %SOURCE3 files%{_datadir}/xsessions/
+install -pm 644 %SOURCE2 %SOURCE4 files%{_datadir}/gnome-session/sessions/
# replace menu image
rm -f data/theme/menu.png
-install %SOURCE5 data/theme/menu.png
+install -p %SOURCE5 data/theme/menu.png
# files replaced with fedora files
rm -f files%{_datadir}/desktop-directories/cinnamon-{menu-applications,utility,utility-accessibility,development,education,game,graphics,network,audio-video,office,system-tools,other}.directory
# adjust font size
@@ -223,6 +228,11 @@ fi
%changelog
+* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.8.git7959517
+- filter provides and requires
+- Remove requires dbus-x11
+- Add -p to install
+
* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.7.git7959517
- Remove %%define and rebase settings patch
- Hardcode version for patches
More information about the scm-commits
mailing list