[orage] Upgrade to 2011-01-09 git snapshot

Kevin Fenzi kevin at fedoraproject.org
Wed Jan 12 22:32:54 UTC 2011


commit b3dacc364acfdb8be32d0f989904ade95e4ee28f
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Jan 12 15:32:38 2011 -0700

    Upgrade to 2011-01-09 git snapshot

 .gitignore                     |    1 +
 orage-4.7.5.16-libnotify.patch |   17 -----------------
 orage-4.7.6.13-libnotify.patch |   17 +++++++++++++++++
 orage.spec                     |   15 ++++++++++-----
 sources                        |    2 +-
 5 files changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da44729..5f94d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 orage-4.6.1.tar.bz2
 /orage-4.7.5.tar.bz2
+/orage-493faff1dafe25a46b0c9090636a21674c1705dc.tar.bz2
diff --git a/orage-4.7.6.13-libnotify.patch b/orage-4.7.6.13-libnotify.patch
new file mode 100644
index 0000000..79533b3
--- /dev/null
+++ b/orage-4.7.6.13-libnotify.patch
@@ -0,0 +1,17 @@
+diff -Nur orage-493faff1dafe25a46b0c9090636a21674c1705dc.orig/src/reminder.c orage-493faff1dafe25a46b0c9090636a21674c1705dc/src/reminder.c
+--- orage-493faff1dafe25a46b0c9090636a21674c1705dc.orig/src/reminder.c	2011-01-09 02:07:25.000000000 -0700
++++ orage-493faff1dafe25a46b0c9090636a21674c1705dc/src/reminder.c	2011-01-12 14:32:57.000000000 -0700
+@@ -557,12 +557,8 @@
+         g_strlcat(heading, l_alarm->action_time, 90);
+         g_strlcat(heading, "<\b>", 10);
+     }
+-    n = notify_notification_new(heading, l_alarm->description, NULL, NULL);
++    n = notify_notification_new(heading, l_alarm->description, NULL);
+     l_alarm->active_alarm->active_notify = n;
+-    if (g_par.trayIcon 
+-    && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
+-        notify_notification_attach_to_status_icon(n
+-                , (GtkStatusIcon *)g_par.trayIcon);
+ 
+     if (l_alarm->notify_timeout == -1)
+         notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);
diff --git a/orage.spec b/orage.spec
index 685eec5..c5e59b8 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,11 +1,11 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.7.5.16
-Release: 3%{?dist}
+Version: 4.7.6.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/apps/orage/4.7/orage-4.7.5.tar.bz2
-Patch0: orage-4.7.5.16-libnotify.patch
+Source0: http://git.xfce.org/apps/orage/snapshot/orage-493faff1dafe25a46b0c9090636a21674c1705dc.tar.bz2
+Patch0: orage-4.7.6.13-libnotify.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxfce4util-devel 
@@ -18,6 +18,7 @@ BuildRequires: db4-devel
 BuildRequires: libnotify-devel
 BuildRequires: libical-devel
 BuildRequires: popt-devel
+BuildRequires: xfce4-dev-tools
 Requires: dbus
 
 Provides: xfcalendar = %{version}-%{release}
@@ -31,10 +32,11 @@ day use it launches itself in the background as a daemon and can be accessed
 using the Orage Clock plugin for the panel. 
 
 %prep
-%setup -q
+%setup -q -n orage-493faff1dafe25a46b0c9090636a21674c1705dc
 %patch0 -p1 
 
 %build
+./autogen.sh
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/libical"
 %configure --disable-static --enable-libical
 
@@ -90,6 +92,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_mandir}/man1/tz_convert.1.gz
 
 %changelog
+* Sun Jan 09 2011 Kevin Fenzi <kevin at tummy.com> - 4.7.6.13-1
+- Upgrade to 2011-01-09 git snapshot
+
 * Fri Nov 05 2010 Kevin Fenzi <kevin at tummy.com> - 4.7.5.16-3
 - Add patch for new libnotify
 
diff --git a/sources b/sources
index 7dd0023..ddda337 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00200f79c1282ff8f416b300a16f7f45  orage-4.7.5.tar.bz2
+93909b5e85d78c8163cf8764194b2425  orage-493faff1dafe25a46b0c9090636a21674c1705dc.tar.bz2


More information about the scm-commits mailing list