rpms/glunarclock/FC-4 glunarclock-0.32.2-i18n_macro.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 glunarclock.spec, 1.8, 1.9 sources, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/glunarclock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20852

Modified Files:
	.cvsignore glunarclock.spec sources 
Added Files:
	glunarclock-0.32.2-i18n_macro.patch 
Log Message:
put back a needed patch

glunarclock-0.32.2-i18n_macro.patch:

Index: glunarclock-0.32.2-i18n_macro.patch
===================================================================
RCS file: glunarclock-0.32.2-i18n_macro.patch
diff -N glunarclock-0.32.2-i18n_macro.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ glunarclock-0.32.2-i18n_macro.patch	30 Jul 2005 07:18:28 -0000	1.3
@@ -0,0 +1,11 @@
+diff -Nur glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c glunarclock-0.32.2/screen-exec/egg-screen-help.c
+--- glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c	2003-03-10 13:02:08.000000000 +0100
++++ glunarclock-0.32.2/screen-exec/egg-screen-help.c	2005-04-15 02:29:09.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <glib.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-help.h>
+ #include <libgnome/gnome-program.h>
+ #include <libgnome/gnome-i18n.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Jul 2005 06:50:11 -0000	1.5
+++ .cvsignore	30 Jul 2005 07:18:28 -0000	1.6
@@ -1,2 +1 @@
-glunarclock-0.32.2-autoreconf.patch.bz2
 glunarclock-0.32.4.tar.gz


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/FC-4/glunarclock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glunarclock.spec	30 Jul 2005 06:50:11 -0000	1.8
+++ glunarclock.spec	30 Jul 2005 07:18:28 -0000	1.9
@@ -1,13 +1,14 @@
 Name:           glunarclock
 Version:        0.32.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://glunarclock.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch2:         glunarclock-0.32.2-i18n_macro.patch
+Patch0:         glunarclock-0.32.2-i18n_macro.patch
+Patch1:         glunarclock-0.32.4-bug149711.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -31,7 +32,9 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .i18n_macro
+%patch0 -p1 -b .i18n_macro
+%patch1 -p1 -b .bug149711
+
 
 %build
 %configure
@@ -87,11 +90,10 @@
 
 
 %changelog
-* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.32.4-1
+* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.32.4-2
 - Update to 0.32.4.
 - Fix compiler warnings bug #149711.
-- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether
-  they are still needed.
+- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2).
 
 * Fri Apr 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.32.2-4
 - Add patch2 to fix build for FC4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Jul 2005 06:50:11 -0000	1.5
+++ sources	30 Jul 2005 07:18:28 -0000	1.6
@@ -1,2 +1 @@
-3ac5e08b5ffa5cd697fe4115d791f4ab  glunarclock-0.32.2-autoreconf.patch.bz2
 63e1d989581e6bf95cec82ff1bbc56ef  glunarclock-0.32.4.tar.gz