[orage] Add xfce4-clock icon for globaltime (#678702)

Christoph Wickert cwickert at fedoraproject.org
Tue Mar 29 00:36:03 UTC 2011


commit ad7fa0f707949dc181f93735fcf08ab758d25ede
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Mar 29 02:35:52 2011 +0200

    Add xfce4-clock icon for globaltime (#678702)

 .gitignore |    2 ++
 orage.spec |   15 ++++++++++++---
 sources    |    2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13757d7..5231757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ orage-4.6.1.tar.bz2
 /orage-493faff1dafe25a46b0c9090636a21674c1705dc.tar.bz2
 /orage-4.8.0.tar.bz2
 /orage-4.8.1.tar.bz2
+/xfce4-clock.png
+/xfce4-clock.svg
diff --git a/orage.spec b/orage.spec
index b815c68..79c6adc 100644
--- a/orage.spec
+++ b/orage.spec
@@ -2,13 +2,16 @@
 
 Name:           orage
 Version:        4.8.1
-Release:        1%{?dist}
+Release:        2%{?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
@@ -58,6 +61,9 @@ 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
@@ -87,8 +93,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
 %{_datadir}/orage/
 %{_libexecdir}/xfce4/panel-plugins/xfce4-orageclock-plugin
-%{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
-%{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
 %{_datadir}/dbus-1/services/org.xfce.calendar.service
 %{_datadir}/dbus-1/services/org.xfce.orage.service
@@ -97,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/tz_convert.1.*
 
 %changelog
+* Tue Mar 29 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-2
+- Add xfce4-clock icon for globaltime (#678702)
+
 * Sat Feb 26 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-1
 - Update to 4.8.1
 - Remove libnotify patch (upstreamed)
diff --git a/sources b/sources
index 87ad734..1d9d7ec 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 9c1139ce03e9f309240e712cf31b6a49  orage-4.8.1.tar.bz2
+311746c0b3a0539abb838a2165251a41  xfce4-clock.png
+25c31cc29b91c92502364efb6fc0b068  xfce4-clock.svg


More information about the scm-commits mailing list