[orage/f15/master] Move xfce4-clock icons to xfce4-panel and require it

Christoph Wickert cwickert at fedoraproject.org
Sun May 8 14:10:00 UTC 2011


commit 274ee2e8fad039d631494397d006fb78d3f7e929
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun May 8 16:08:58 2011 +0200

    Move xfce4-clock icons to xfce4-panel and require it

 orage.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/orage.spec b/orage.spec
index 79c6adc..aa4ad3d 100644
--- a/orage.spec
+++ b/orage.spec
@@ -2,16 +2,13 @@
 
 Name:           orage
 Version:        4.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Time-managing application for Xfce4
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# clock icon taken from system-config-date, license is GPLv2+
-Source1:        xfce4-clock.png
-Source2:        xfce4-clock.svg
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxfcegui4-devel 
 BuildRequires:  xfce4-panel-devel >= 4.6.0
@@ -23,6 +20,7 @@ BuildRequires:  libical-devel >= 0.43
 BuildRequires:  popt-devel
 BuildRequires:  dbus-glib-devel >= 0.34
 Requires:       dbus
+Requires:       xfce4-panel
 
 Provides:       xfcalendar = %{version}-%{release}
 Obsoletes:      xfcalendar <= 4.2.3-3.fc6
@@ -61,9 +59,6 @@ desktop-file-install                            \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/globaltime.desktop
 
-install -pm 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
-install -pm 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps/
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/tz_convert.1.*
 
 %changelog
+* Sun May 08 2011 Christoph Wickert <wickert at kolabsys.com> - 4.8.1-3
+- Move xfce4-clock icons to xfce4-panel and require it
+
 * Tue Mar 29 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-2
 - Add xfce4-clock icon for globaltime (#678702)
 


More information about the scm-commits mailing list