rpms/glunarclock/devel glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.7, 1.8 sources, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/glunarclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354

Modified Files:
	.cvsignore glunarclock.spec sources 
Added Files:
	glunarclock-0.32.4-bug149711.patch 
Log Message:
* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.32.4-1
- 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.


glunarclock-0.32.4-bug149711.patch:

--- NEW FILE glunarclock-0.32.4-bug149711.patch ---
diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c
--- glunarclock-0.32.4-orig/src/glunarclock.c	2005-04-06 12:51:29.000000000 +0200
+++ glunarclock-0.32.4/src/glunarclock.c	2005-07-25 00:39:56.000000000 +0200
@@ -154,14 +154,14 @@
 			gtk_toggle_button_get_active (toggle), NULL);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_dialog (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c
--- glunarclock-0.32.4-orig/src/moondata.c	2005-01-04 18:28:43.000000000 +0100
+++ glunarclock-0.32.4/src/moondata.c	2005-07-25 00:39:55.000000000 +0200
@@ -219,14 +219,14 @@
 	mod_time(&moondata.LAT);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_data_dialog (GtkWidget  *widget,
 		   MoonApplet *moon)
 {
@@ -280,10 +280,10 @@
 /* 	gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */
 /* 	format_time(buf, size, moondata.NewMoon*24.0); */
 
-	g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon);
+	g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon);
 	gtk_label_set_text(GTK_LABEL(mw.flm), buf);
 
-	g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon));
+	g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon));
 	gtk_label_set_text(GTK_LABEL(mw.nwm), buf);
 
 /*  	g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2005 16:42:01 -0000	1.4
+++ .cvsignore	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 glunarclock-0.32.2-autoreconf.patch.bz2
-glunarclock-0.32.2.tar.gz
+glunarclock-0.32.4.tar.gz


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glunarclock.spec	15 Apr 2005 00:38:26 -0000	1.7
+++ glunarclock.spec	24 Jul 2005 23:14:59 -0000	1.8
@@ -1,14 +1,14 @@
 Name:           glunarclock
-Version:        0.32.2
-Release:        4
+Version:        0.32.4
+Release:        1%{?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/glunarclock/glunarclock-0.32.2.tar.gz
-Patch0:         glunarclock-configure.in.patch
-Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Patch0:         glunarclock-configure.in.patch
+#Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
 Patch2:         glunarclock-0.32.2-i18n_macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,12 +33,12 @@
 
 %prep
 %setup -q
-%ifarch x86_64
+#%ifarch x86_64
 # patch0 is normally only needed if you want to recreate patch1
-%patch0
+#%patch0
 # was created after autoreconf -f -i and removing autom4te.cache/
-%patch1 -p1
-%endif
+#%patch1 -p1
+#%endif
 %patch2 -p1 -b .i18n_macro
 
 %build
@@ -95,6 +95,12 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.32.4-1
+- 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.
+
 * 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/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 16:42:01 -0000	1.4
+++ sources	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 3ac5e08b5ffa5cd697fe4115d791f4ab  glunarclock-0.32.2-autoreconf.patch.bz2
-3ac61aa62af4e0d53c90c18f09ee988f  glunarclock-0.32.2.tar.gz
+63e1d989581e6bf95cec82ff1bbc56ef  glunarclock-0.32.4.tar.gz