--- a/ChangeLog Wed Feb 18 16:28:27 2004 +0000
+++ b/ChangeLog Wed Feb 18 17:05:01 2004 +0000
@@ -1,3 +1,9 @@
+2004-02-18 Matt Keenan <[email protected]>
+
+ * gnome-pilot.spec: Distro to cinnabar, port patches etc..
+ * patches/gnome-pilot-03-add-all-linguas.diff: ported patch
+ * patches/gnome-pilot-03-trans-pilot-menu.diff: ported patch
+
2004-02-18 Matt Keenan <[email protected]>
* file-roller.spec: bump to 2.5.4, add l10n stuff
--- a/gnome-pilot.spec Wed Feb 18 16:28:27 2004 +0000
+++ b/gnome-pilot.spec Wed Feb 18 17:05:01 2004 +0000
@@ -2,13 +2,16 @@
License: GPL/LGPL
Group: Applications/Communications
Version: 2.0.10
-Release: 18
-Distribution: QuickSilver
+Release: 19
+Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: PalmOS link utilities
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
+Source1: gnome-pilot-l10n-po-0.8.tar.bz2
Patch1: gnome-pilot-01-potfiles-in.diff
Patch2: gnome-pilot-02-menu-entry.diff
+Patch3: gnome-pilot-03-add-all-linguas.diff
+Patch4: gnome-pilot-04-trans-pilot-menu.diff
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Docdir: %{_defaultdocdir}/gnome-pilot
@@ -45,8 +48,16 @@
%setup -q
%patch1 -p1
%patch2 -p1
+bzcat %SOURCE1 | tar xvf -
+%patch3 -p1
+%patch4 -p1
%build
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
+automake -a -c -f
+autoconf
+
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
@@ -101,6 +112,10 @@
%{_libdir}/*.so
%changelog
+* Wed Feb 18 2004 - [email protected]
+- Updated distro to Cinnabar, added l10n stuff
+- Port patchs 03/04, and libtoolize it
+
* Fri Oct 31 2003 - [email protected]
- Remove the Sun Settings keyword from the
menu entry patch.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-03-add-all-linguas.diff Wed Feb 18 17:05:01 2004 +0000
@@ -0,0 +1,11 @@
+--- ../gnome-pilot-2.0.10.old/configure.in 2004-02-18 16:37:00.000000000 +0000
++++ ./configure.in 2004-02-18 16:38:24.000000000 +0000
+@@ -172,7 +172,7 @@
+ GETTEXT_PACKAGE=gnome-pilot
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", "Package name")
+-ALL_LINGUAS="am az ca cs cy da de el es fi fr gl he hu ja nl nn no pl pt pt_BR ru sk sv tr uk vi zh_TW"
++ALL_LINGUAS="am az ca cs cy da de el es fi fr gl he hu it ja ko nl nn no pl pt pt_BR ru sk sv tr uk vi zh_CN zh_HK zh_TW"
+ AM_GLIB_GNU_GETTEXT
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-04-trans-pilot-menu.diff Wed Feb 18 17:05:01 2004 +0000
@@ -0,0 +1,242 @@
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/GNOME_PilotApplet.server.in.in 2004-02-18 16:45:49.000000000 +0000
+@@ -22,7 +22,8 @@
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+
+- <oaf_attribute name="name" type="string" value="Pilot Applet"/>
++ <oaf_attribute name="name" type="string" _value="Pilot Applet"/>
++ <oaf_attribute name="description" type="string" _value="Pilot Applet"/>
+
+ <oaf_attribute name="panel:category" type="string" _value="Utility"/>
+ <oaf_attribute name="panel:icon" type="string" value="sync_icon.png"/>
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOff.xml 1970-01-01 01:00:00.000000000 +0100
++++ ./applet/GNOME_PilotAppletOff.xml 2004-02-18 16:53:23.000000000 +0000
+@@ -0,0 +1,15 @@
++<Root>
++ <popups>
++ <popup name="button3">
++ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
++ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
++ <menuitem name="Pause Daemon" verb="Pause Daemon" _label="Pause Daemon" pixtype="stock" pixname="stop"/>
++ <separator/>
++ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
++ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
++ </popup>
++ </popups>
++</Root>
++
+--- ../gnome-pilot-2.0.10.old/applet/GNOME_PilotAppletOn.xml 1970-01-01 01:00:00.000000000 +0100
++++ ./applet/GNOME_PilotAppletOn.xml 2004-02-18 16:53:27.000000000 +0000
+@@ -0,0 +1,15 @@
++<Root>
++ <popups>
++ <popup name="button3">
++ <menuitem name="Restore" verb="Restore" _label="Restore..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Restart" verb="Restart" _label="Restart" pixtype="stock" pixname="gtk-execute"/>
++ <menuitem name="Log" verb="Log" _label="Last log..." pixtype="stock" pixname="gtk-new"/>
++ <menuitem name="Continue" verb="Continue" _label="Continue" pixtype="stock" pixname="refresh"/>
++ <separator/>
++ <menuitem name="Props" verb="Props" _label="Preferences..." pixtype="stock" pixname="gtk-properties"/>
++ <menuitem name="Item 2" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
++ <menuitem name="Item 3" verb="About" _label="About..." pixtype="stock" pixname="gnome-stock-about"/>
++ </popup>
++ </popups>
++</Root>
++
+--- ../gnome-pilot-2.0.10.old/applet/Makefile.am 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/Makefile.am 2004-02-18 16:48:12.000000000 +0000
+@@ -54,6 +54,9 @@
+
+ @INTLTOOL_SERVER_RULE@
+
++uidir = $(datadir)/gnome-2.0/ui
++ui_DATA = GNOME_PilotAppletOn.xml GNOME_PilotAppletOff.xml
++
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+ schemas_in_files = pilot.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@@ -69,6 +72,7 @@
+
+ EXTRA_DIST = \
+ GNOME_PilotApplet.server.in.in \
++ $(ui_DATA) \
+ $(pixmap_DATA) \
+ $(glade_DATA) \
+ $(gobfiles) \
+--- ../gnome-pilot-2.0.10.old/applet/pilot.c 2004-02-18 16:37:00.000000000 +0000
++++ ./applet/pilot.c 2004-02-18 16:52:05.000000000 +0000
+@@ -664,36 +664,33 @@
+ install_popup_menu (PilotApplet *self, gboolean on_off)
+ {
+ char *menu_xml;
+- const char *menu_template =
+- "<popup name=\"button3\">"
+- "<menuitem name=\"Restore\" verb=\"Restore\" _label=\"Restore...\""
+- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
+- "<menuitem name=\"State\" verb=\"State\" _label=\"%s\""
+- " pixtype=\"stock\" pixname=\"%s\"/>"
+- "<menuitem name=\"Restart\" verb=\"Restart\" _label=\"Restart\""
+- " pixtype=\"stock\" pixname=\"gtk-execute\"/>"
+- "<menuitem name=\"Log\" verb=\"Log\" _label=\"Last log...\""
+- " pixtype=\"stock\" pixname=\"gtk-new\"/>"
+- "<separator/>"
+- "<menuitem name=\"Props\" verb=\"Props\" _label=\"Preferences...\""
+- " pixtype=\"stock\" pixname=\"gtk-properties\"/>"
+- "<menuitem name=\"Item 2\" verb=\"Help\" _label=\"Help\""
+- " pixtype=\"stock\" pixname=\"gtk-help\"/>"
+- "<menuitem name=\"Item 3\" verb=\"About\" _label=\"About...\""
+- " pixtype=\"stock\" pixname=\"gnome-stock-about\"/>"
+- "</popup>";
+
+ if (on_off)
+- menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
++ panel_applet_setup_menu_from_file (self->applet,
++ NULL, /* opt_datadir */
++ "GNOME_PilotAppletOn.xml",
++ NULL,
++ pilot_applet_menu_verbs,
++ self);
+ else
+- menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
++ panel_applet_setup_menu_from_file (self->applet,
++ NULL, /* opt_datadir */
++ "GNOME_PilotAppletOff.xml",
++ NULL,
++ pilot_applet_menu_verbs,
++ self);
+
++ /*
++ menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
++ else
++ menu_xml = g_strdup_printf (menu_template, _("Pause Daemon"), "stop");
+ panel_applet_setup_menu ( self->applet,
+ menu_xml,
+ pilot_applet_menu_verbs,
+ self);
+
+ g_free (menu_xml);
++ */
+ }
+
+ static void
+--- ../gnome-pilot-2.0.10.old/configure.in 2004-02-18 16:55:57.000000000 +0000
++++ ./configure.in 2004-02-18 16:57:24.000000000 +0000
+@@ -145,7 +145,103 @@
+ AC_MSG_ERROR([GOB2 not found and the gob outputfiles are not present, check http://www.5z.com/jirka/gob.html and read the HACKING file])
+ fi
+ else
+- GOB2_CHECK(2.0.3)
++# Extract the first word of "gob2", so it can be a program name with args.
++set dummy gob2; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_GOB2+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GOB2 in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GOB2="$GOB2" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_GOB2="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ ;;
++esac
++fi
++GOB2=$ac_cv_path_GOB2
++
++if test -n "$GOB2"; then
++ echo "$as_me:$LINENO: result: $GOB2" >&5
++echo "${ECHO_T}$GOB2" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ if test ! x$GOB2 = x; then
++ if test ! x2.0.3 = x; then
++ echo "$as_me:$LINENO: checking for gob-2 >= 2.0.3" >&5
++echo $ECHO_N "checking for gob-2 >= 2.0.3... $ECHO_C" >&6
++ g_r_ve=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ g_r_ma=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ g_r_mi=`echo 2.0.3|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ g_ve=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ g_ma=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ g_mi=`$GOB2 --version 2>&1|sed 's/Gob version \([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++ if test $g_ve -eq $g_r_ve; then
++ if test $g_ma -ge $g_r_ma; then
++ if test $g_mi -ge $g_r_mi; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ if test $g_ma -gt $g_r_ma; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
++echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++ else
++ { { echo "$as_me:$LINENO: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&5
++echo "$as_me: error: \"found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi\"" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ else
++ if test $g_ve -gt $g_r_ve; then
++ echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++ else
++ { { echo "$as_me:$LINENO: error: major version $g_ve found but $g_r_ve required" >&5
++echo "$as_me: error: major version $g_ve found but $g_r_ve required" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++
++ unset gob_version
++ unset g_ve
++ unset g_ma
++ unset g_mi
++ unset g_r_ve
++ unset g_r_ma
++ unset g_r_mi
++ fi
++
++
++ else
++ { echo "$as_me:$LINENO: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&5
++echo "$as_me: WARNING: Cannot find GOB-2, check http://www.5z.com/jirka/gob.html" >&2;}
++ fi
++
++
+ fi
+
+ dnl ***********
+--- ../gnome-pilot-2.0.10.old/po/POTFILES.in 2004-02-18 16:55:57.000000000 +0000
++++ ./po/POTFILES.in 2004-02-18 16:57:42.000000000 +0000
+@@ -1,6 +1,8 @@
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+ applet/GNOME_PilotApplet.server.in.in
++applet/GNOME_PilotAppletOn.xml
++applet/GNOME_PilotAppletOff.xml
+ applet/pilot-applet.glade
+ applet/pilot.c
+ applet/pilot.schemas.in