rpms/glunarclock/FC-3 glunarclock-0.32.2-i18n_macro.patch, NONE, 1.1 glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.4, 1.5 sources, 1.4, 1.5 glunarclock-configure.in.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Jul 30 19:18:58 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/glunarclock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5017
Modified Files:
.cvsignore glunarclock.spec sources
Added Files:
glunarclock-0.32.2-i18n_macro.patch
glunarclock-0.32.4-bug149711.patch
Removed Files:
glunarclock-configure.in.patch
Log Message:
update for FC3 - sync with devel
glunarclock-0.32.2-i18n_macro.patch:
--- NEW FILE glunarclock-0.32.2-i18n_macro.patch ---
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>
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/FC-3/.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 30 Jul 2005 19:18:56 -0000 1.5
@@ -1,2 +1 @@
-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/FC-3/glunarclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glunarclock.spec 13 Feb 2005 16:42:01 -0000 1.4
+++ glunarclock.spec 30 Jul 2005 19:18:56 -0000 1.5
@@ -1,15 +1,14 @@
Name: glunarclock
-Version: 0.32.2
-Release: 2
-Epoch: 0
+Version: 0.32.4
+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/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-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
@@ -33,12 +32,9 @@
%prep
%setup -q
-%ifarch x86_64
-# patch0 is normally only needed if you want to recreate patch1
-%patch0
-# was created after autoreconf -f -i and removing autom4te.cache/
-%patch1 -p1
-%endif
+%patch0 -p1 -b .i18n_macro
+%patch1 -p1 -b .bug149711
+
%build
%configure
@@ -81,7 +77,7 @@
%files -f glunarclock-0.32.lang
%defattr (-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README
%{_sysconfdir}/gconf/schemas/*
%{_libexecdir}/*
%{_datadir}/glunarclock
@@ -94,8 +90,19 @@
%changelog
+* 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 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.
+
+* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.32.2-2
-- Add autoreconf and configure.in patch to fix x86_64;
+- Add autoreconf and configure.in patch to fix x86_64;
* Sun Jan 16 2005 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.32.2-1
- Updated to 0.32.2.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/FC-3/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 30 Jul 2005 19:18:56 -0000 1.5
@@ -1,2 +1 @@
-3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2
-3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz
+63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz
--- glunarclock-configure.in.patch DELETED ---
More information about the fedora-extras-commits
mailing list