Hello community, here is the log from the commit of package loki_setup checked in at Fri Jun 9 02:34:06 CEST 2006. -------- --- loki_setup/loki_setup.changes 2006-06-01 20:33:11.000000000 +0200 +++ loki_setup/loki_setup.changes 2006-06-08 16:27:18.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 8 16:20:46 CEST 2006 - lnussel@suse.de + +- Use --no-upgrade for loki_update glade2 file as the C code cannot + deal with the new widgets. +- don't link libxml statically into loki_update +- fix exit code check in loki-setup script +- fix path to locale files + +------------------------------------------------------------------- New: ---- TODO loki_setup-locale.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ loki_setup.spec ++++++ --- /var/tmp/diff_new_pack.eYb7RM/_old 2006-06-09 02:33:56.000000000 +0200 +++ /var/tmp/diff_new_pack.eYb7RM/_new 2006-06-09 02:33:56.000000000 +0200 @@ -17,7 +17,7 @@ URL: http://icculus.org/loki_setup/ Group: Development/Tools/Other Version: 1.6.5_20060530 -Release: 1 +Release: 2 Summary: Installer Program Mainly for Games BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: loki_setup-current.tar.bz2 @@ -42,6 +42,7 @@ Patch8: loki_setup-CCnotLD.diff Patch9: loki_setup-signed-char.diff Patch10: loki_setup-configure_test.diff +Patch11: loki_setup-locale.diff # setupdb Patch20: loki_setupdb-signed-char.diff Patch21: loki_setupdb-Makefile.diff @@ -68,7 +69,7 @@ %package -n loki_uninstall Version: 1.0.3_20051201 -Release: 14 +Release: 15 Summary: Uninstall program for games Group: Amusements/Games/Other @@ -85,7 +86,7 @@ %package -n loki_update Version: 1.0.13_20040208 -Release: 49 +Release: 50 Summary: Updater program for games Group: Amusements/Games/Other @@ -139,6 +140,7 @@ qpatch %{PATCH8} qpatch %{PATCH9} qpatch %{PATCH10} +qpatch %{PATCH11} qpush # cd loki_setupdb @@ -168,7 +170,7 @@ find -type d -name CVS -print0 |xargs -0 rm -rv # GTK2 issues: sed -i 's/\.gtk /.gtk2 /;s/\([^2]\).glade/\1.gtk2.glade/' loki-setup loki-uninstall -libglade-convert loki_update/loki_update.glade | sed 's:"pixbuf">:&pixmaps/:' >loki_update/loki_update.gtk2.glade +libglade-convert --no-upgrade loki_update/loki_update.glade | sed 's:"pixbuf">:&pixmaps/:' >loki_update/loki_update.gtk2.glade sed -i 's/".glade"/".gtk2.glade"/' loki_update/gtk_ui.c sed -i 's/ loki_update.glade/& loki_update.gtk2.glade/' loki_update/Makefile @@ -215,7 +217,6 @@ # echo make \ DATADIR=%{_datadir}/loki_uninstall \ - LOCALEDIR=%{_datadir}/locale \ all loki_uninstall > build . ./build if [ -z "$build_dynamic" ]; then @@ -399,6 +400,12 @@ %{_datadir}/loki_patch %changelog -n loki_setup +* Thu Jun 08 2006 - lnussel@suse.de +- Use --no-upgrade for loki_update glade2 file as the C code cannot + deal with the new widgets. +- don't link libxml statically into loki_update +- fix exit code check in loki-setup script +- fix path to locale files * Thu Jun 01 2006 - sbrabec@suse.cz - Updated to latest CVS version: * GTK2 support ++++++ loki-setup.sh.in ++++++ --- loki_setup/loki-setup.sh.in 2004-08-29 00:55:54.000000000 +0200 +++ loki_setup/loki-setup.sh.in 2006-06-08 16:12:05.000000000 +0200 @@ -12,6 +12,7 @@ SETUP_LOCALEDIR=@DATADIR@/loki-setup/image/setup.data/locale export SETUP_GLADE_FILE SETUP_LOCALEDIR loki-setup.gtk "$@" -if [ "$?" = 2 ]; then +s="$?" +if [ "$s" != 0 -a "$s" = 2 ]; then loki-setup.curses "$@" fi ++++++ loki_setup-locale.diff ++++++ ? loki_setup-locale.diff Index: loki_setup/setup-locale.h =================================================================== --- loki_setup.orig/setup-locale.h +++ loki_setup/setup-locale.h @@ -36,7 +36,7 @@ const char *translation_lookup_table(con #define PACKAGE "setup" #ifndef LOCALEDIR -#define LOCALEDIR SETUP_BASE "locale" +#define LOCALEDIR "locale" #endif #endif ++++++ loki_update-Makefile.diff ++++++ --- /var/tmp/diff_new_pack.eYb7RM/_old 2006-06-09 02:33:58.000000000 +0200 +++ /var/tmp/diff_new_pack.eYb7RM/_new 2006-06-09 02:33:58.000000000 +0200 @@ -1,8 +1,19 @@ Index: loki_update/Makefile =================================================================== ---- loki_update.orig/Makefile 2004-02-08 10:26:25.000000000 +0000 -+++ loki_update/Makefile 2004-03-08 13:48:33.232738278 +0000 -@@ -44,9 +44,7 @@ +--- loki_update.orig/Makefile ++++ loki_update/Makefile +@@ -32,9 +32,8 @@ LFLAGS += -Wl,-Bstatic + # You can find Ares at: ftp://athena-dist.mit.edu/pub/ATHENA/ares + LFLAGS += -L./libs/ares-1.1.0 -lares + LFLAGS += -L$(SETUPDB)/$(arch) -lsetupdb +-LFLAGS += $(shell xml-config --libs) +-LFLAGS += -lxml -lz + LFLAGS += -Wl,-Bdynamic ++LFLAGS += $(shell xml-config --libs) + LFLAGS += -lm -ldl + + TTY_LFLAGS = +@@ -44,9 +43,7 @@ GTK_ST_LFLAGS += $(shell libglade-config GTK_ST_LFLAGS += $(shell gtk-config --libs) GTK_ST_LFLAGS += -Wl,-Bdynamic @@ -12,7 +23,7 @@ GTK_SH_LFLAGS += $(shell gtk-config --libs) CORE_OBJS = loki_update.o prefpath.o url_paths.o meta_url.o \ -@@ -61,7 +59,7 @@ +@@ -61,7 +58,7 @@ OBJS = $(CORE_OBJS) $(SNARF_OBJS) CORE_SRCS = $(CORE_OBJS:.o=.c) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org