commit loki_setup for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package loki_setup for openSUSE:Factory
checked in at Thu Jan 14 22:09:30 CET 2010.
--------
--- loki_setup/loki_setup.changes 2009-06-19 11:03:47.000000000 +0200
+++ loki_setup/loki_setup.changes 2010-01-07 17:23:22.000000000 +0100
@@ -1,0 +2,30 @@
+Thu Jan 7 14:42:51 CET 2010 - vuntz@opensuse.org
+
+- Only require gtk1-compat-devel on openSUSE 11.2 and earlier. It's
+ generally not needed since loki_* has been ported to GTK+ 2.x,
+ but to be on the safe side, we keep a
+ loki_patch-gtk1-compat.diff patch (see below) that requires
+ glib-config.
+- Drop gtk1-compat-devel BuildRequires: it shouldn't be needed
+ anymore since it has been ported to GTK+ 2.x.
+- Add loki_setup-xgettext-glade.diff: use xgettext directly instead
+ of libglade-xgettext, that doesn't exist anymore.
+- Update loki_update-Makefile.diff:
+ + use xml2-config and pkg-config instead of
+ {xml,gtk,libglade}-config
+ + add -DGTK_ENABLE_BROKEN to make the build work with really old
+ GTK+ API
+ + use xgettext directly instead of libglade-xgettext
+- Add loki_update-libglade2.patch: port the code to libglade2 API.
+- Update loki_patch-fixes.diff:
+ + do not use gtk-config in Makefile.in since the xdelta
+ cflags/libs will have the right value in openSUSE 11.3
+ + do not add AM_PATH_GTK in configure.in for the same reason
+ + use xml2-config instead of xml-config
+- Update loki_patch-xdelta.diff: do not change AM_PATH_GTK to
+ AM_PATH_GLIB since it's not there anymore.
+- Add loki_patch-gtk1-compat.diff: this patch will be
+ applied on openSUSE < 11.3, to get the same results as before.
+- Pass --with-libxml2 to configure of loki_setupdb.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
loki_patch-gtk1-compat.diff
loki_setup-xgettext-glade.diff
loki_update-libglade2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ loki_setup.spec ++++++
--- /var/tmp/diff_new_pack.hwWpfO/_old 2010-01-14 22:05:19.000000000 +0100
+++ /var/tmp/diff_new_pack.hwWpfO/_new 2010-01-14 22:05:19.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package loki_setup (Version 1.6.5_20070404)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,21 +19,24 @@
Name: loki_setup
-BuildRequires: gpm gtk1-compat-devel gtk2-devel libglade2-devel ncurses-devel pkgconfig python python-xml update-desktop-files zlib-devel
+BuildRequires: gpm gtk2-devel libglade2-devel ncurses-devel pkgconfig python python-xml update-desktop-files zlib-devel
%if %suse_version > 1020
BuildRequires: fdupes
%endif
+%if %suse_version <= 1120
+BuildRequires: gtk1-compat-devel
+%endif
%if %suse_version > 1030
BuildRequires: xdelta-devel
%else
BuildRequires: xdelta
%endif
%define do_brandelf 1
-License: GPL v2 or later
+License: GPLv2+
Url: http://icculus.org/loki_setup/
Group: Development/Tools/Other
Version: 1.6.5_20070404
-Release: 179
+Release: 180
Summary: Installer Program Mainly for Games
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: loki_setup-current.tar.bz2
@@ -60,6 +63,7 @@
Patch10: loki_setup-configure_test.diff
Patch11: loki_setup-locale.diff
Patch12: loki_setup-exitcode.diff
+Patch13: loki_setup-xgettext-glade.diff
# setupdb
Patch20: loki_setupdb-signed-char.diff
Patch21: loki_setupdb-Makefile.diff
@@ -67,9 +71,12 @@
Patch41: loki_update-adig.diff
Patch42: loki_update-snarf.diff
Patch43: loki_update-Makefile.diff
+Patch44: loki_update-libglade2.patch
+# patch
Patch60: loki_patch-fixes.diff
Patch61: loki_patch-amd64foo.diff
Patch62: loki_patch-xdelta.diff
+Patch63: loki_patch-gtk1-compat.diff
%description
loki_setup is an installer program mainly for games. It supports an
@@ -85,9 +92,9 @@
Ryan C. Gordon
%package -n loki_uninstall
-License: GPL v2 or later
+License: GPLv2+
Version: 1.0.3_20051201
-Release: 237
+Release: 238
Summary: Uninstall program for games
Group: Amusements/Games/Other
@@ -103,9 +110,9 @@
Ryan C. Gordon
%package -n loki_update
-License: GPL v2 or later
+License: GPLv2+
Version: 1.0.13_20040208
-Release: 272
+Release: 273
Summary: Updater program for games
Group: Amusements/Games/Other
@@ -161,6 +168,7 @@
qpatch %{PATCH10}
qpatch %{PATCH11}
qpatch %{PATCH12}
+qpatch %{PATCH13}
qpush
#
cd loki_setupdb
@@ -178,6 +186,7 @@
qpatch %{PATCH41}
qpatch %{PATCH42}
qpatch %{PATCH43}
+qpatch %{PATCH44}
qpush
#
popd
@@ -185,6 +194,9 @@
qpatch %{PATCH60}
qpatch %{PATCH61}
qpatch %{PATCH62}
+%if %suse_version <= 1120
+qpatch %{PATCH63}
+%endif
qpush
popd
find -type d -name CVS -print0 |xargs -0 rm -rv
@@ -208,7 +220,8 @@
--prefix=%{_prefix} \
--infodir=%{_infodir} \
--mandir=%{_mandir} \
- --with-vendor=loki
+ --with-vendor=loki \
+ --with-libxml2
make
make md5sum brandelf
cd ..
++++++ loki_patch-fixes.diff ++++++
--- /var/tmp/diff_new_pack.hwWpfO/_old 2010-01-14 22:05:20.000000000 +0100
+++ /var/tmp/diff_new_pack.hwWpfO/_new 2010-01-14 22:05:20.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- loki_patch.orig/Makefile.in
+++ loki_patch/Makefile.in
-@@ -5,17 +5,14 @@
+@@ -5,17 +5,14 @@ ARCH := @ARCH@
DISTDIR = ..
VERSION := @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_RELEASE@
PACKAGE = loki_patch-$(VERSION)
@@ -20,13 +20,13 @@
-LFLAGS += $(shell glib-config --libs) $(shell xml-config --libs) -lz -static
+SETUPDB = @SETUPDB@
+CFLAGS = @CFLAGS@
-+CPPFLAGS += $(shell gtk-config --cflags) @XDELTA_CFLAGS@ @XML_CFLAGS@ @SETUPDB_CFLAGS@
++CPPFLAGS += @XDELTA_CFLAGS@ @XML_CFLAGS@ @SETUPDB_CFLAGS@
+CPPFLAGS += -DVERSION=\"$(VERSION)\"
-+LIBS = @LIBS@ $(shell gtk-config --libs) @XDELTA_LIBS@ @XML_LIBS@ @SETUPDB_LIBS@ -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
++LIBS = @LIBS@ @XDELTA_LIBS@ @XML_LIBS@ @SETUPDB_LIBS@ -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
SHARED_OBJS = load_patch.o size_patch.o print_patch.o loki_xdelta.o \
mkdirhier.o log_output.o
-@@ -29,10 +26,10 @@
+@@ -29,10 +26,10 @@ ALL_OBJS = $(SHARED_OBJS) $(MAKE_PATCH_O
all: make_patch loki_patch
make_patch: $(MAKE_PATCH_OBJS) $(SHARED_OBJS)
@@ -68,8 +68,12 @@
ARCH=alpha ;;
*)
ARCH=`uname -m` ;;
-@@ -36,10 +33,9 @@ dnl Look for the XML libraries
- AC_PATH_PROG(HAVEXML, xml-config, $PATH)
+@@ -33,15 +30,14 @@ OS=`uname -s`
+
+ dnl Look for the XML libraries
+
+-AC_PATH_PROG(HAVEXML, xml-config, $PATH)
++AC_PATH_PROG(HAVEXML, xml2-config, $PATH)
if test ! -z "$HAVEXML"; then
XML_CFLAGS=`$HAVEXML --cflags`
- XML_PREFIX=`$HAVEXML --prefix`
@@ -80,9 +84,12 @@
+ AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_LIBS)
else
- AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+- AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
++ AC_MSG_ERROR([*** xml2-config not found. You need a working libxml installation.])
fi
-@@ -60,14 +56,20 @@ fi
+
+ SETUPDB_VERSION=1.0.0
+@@ -60,14 +56,19 @@ fi
dnl Check for correct setupdb installation
if test -f $SETUPDB/$ARCH/libsetupdb.a; then
@@ -94,7 +101,6 @@
fi
-CFLAGS="$CFLAGS -I$SETUPDB"
-+AM_PATH_GTK([1.2.0])
+AM_PATH_XDELTA
AC_SUBST(SETUPDB)
++++++ loki_patch-gtk1-compat.diff ++++++
Index: loki_patch/Makefile.in
===================================================================
--- loki_patch.orig/Makefile.in
+++ loki_patch/Makefile.in
@@ -10,9 +10,9 @@ CC=@CC@
XDELTA_DIR = ./xdelta-1.1.3
SETUPDB = @SETUPDB@
CFLAGS = @CFLAGS@
-CPPFLAGS += @XDELTA_CFLAGS@ @XML_CFLAGS@ @SETUPDB_CFLAGS@
+CPPFLAGS += $(shell glib-config --cflags) @XDELTA_CFLAGS@ @XML_CFLAGS@ @SETUPDB_CFLAGS@
CPPFLAGS += -DVERSION=\"$(VERSION)\"
-LIBS = @LIBS@ @XDELTA_LIBS@ @XML_LIBS@ @SETUPDB_LIBS@ -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
+LIBS = @LIBS@ $(shell glib-config --libs) @XDELTA_LIBS@ @XML_LIBS@ @SETUPDB_LIBS@ -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
SHARED_OBJS = load_patch.o size_patch.o print_patch.o loki_xdelta.o \
mkdirhier.o log_output.o
Index: loki_patch/configure.in
===================================================================
--- loki_patch.orig/configure.in
+++ loki_patch/configure.in
@@ -61,6 +61,7 @@ else
AC_MSG_ERROR([*** Please compile setupdb first!])
fi
+AM_PATH_GLIB([1.2.0])
AM_PATH_XDELTA
AC_SUBST(SETUPDB)
++++++ loki_patch-xdelta.diff ++++++
--- /var/tmp/diff_new_pack.hwWpfO/_old 2010-01-14 22:05:20.000000000 +0100
+++ /var/tmp/diff_new_pack.hwWpfO/_new 2010-01-14 22:05:20.000000000 +0100
@@ -11,16 +11,3 @@
static HandleFuncTable xd_handle_table;
-Index: loki_patch/configure.in
-===================================================================
---- loki_patch.orig/configure.in
-+++ loki_patch/configure.in
-@@ -63,7 +63,7 @@ else
- AC_MSG_ERROR([*** Please compile setupdb first!])
- fi
-
--AM_PATH_GTK([1.2.0])
-+AM_PATH_GLIB([1.2.0])
- AM_PATH_XDELTA
-
- AC_SUBST(SETUPDB)
++++++ loki_setup-xgettext-glade.diff ++++++
Index: loki_setup/Makefile.in
===================================================================
--- loki_setup.orig/Makefile.in
+++ loki_setup/Makefile.in
@@ -287,11 +287,11 @@ dist: distclean
rm -rf $(DISTDIR)/$(PACKAGE)
po/setup.po: $(SRCS) image/setup.data/setup.glade
- libglade-xgettext image/setup.data/setup.glade > po/setup.po
+ xgettext --language=glade image/setup.data/setup.glade -o po/setup.po
xgettext -p po -j -d setup --keyword=_ $(SRCS) plugins/*.c
po/loki-uninstall.po: uninstall.c uninstall_ui.c uninstall.glade
- libglade-xgettext uninstall.glade > po/loki-uninstall.po
+ xgettext --language=glade uninstall.glade -o po/loki-uninstall.po
xgettext -p po -j -d loki-uninstall --keyword=_ uninstall.c uninstall_ui.c
gettext: po/setup.po po/loki-uninstall.po
++++++ loki_update-Makefile.diff ++++++
--- /var/tmp/diff_new_pack.hwWpfO/_old 2010-01-14 22:05:20.000000000 +0100
+++ /var/tmp/diff_new_pack.hwWpfO/_new 2010-01-14 22:05:20.000000000 +0100
@@ -2,27 +2,44 @@
===================================================================
--- loki_update.orig/Makefile
+++ loki_update/Makefile
-@@ -32,9 +32,8 @@ LFLAGS += -Wl,-Bstatic
+@@ -24,30 +24,27 @@ endif
+ CFLAGS += -I$(SETUPDB) -I$(SNARF) -DVERSION=\"$(VERSION)\" -DDYNAMIC_UI
+ CFLAGS += -DPROTOTYPES # for snarf
+ CFLAGS += -DUI_LIBDIR=\"$(UI_LIBDIR)\" -DDATADIR=\"$(DATADIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+-CFLAGS += $(shell gtk-config --cflags) $(shell libglade-config --cflags)
+-CFLAGS += $(shell xml-config --cflags)
++CFLAGS += $(shell pkg-config --cflags gtk+-2.0 libglade-2.0) -DGTK_ENABLE_BROKEN
++CFLAGS += $(shell xml2-config --cflags)
+ LFLAGS = -rdynamic
+ LFLAGS += -Wl,-Bstatic
+ # Used for non-blocking gethostbyname
# 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) -lz
++LFLAGS += $(shell xml2-config --libs) -lz
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,-Bstatic
+-GTK_ST_LFLAGS += $(shell libglade-config --libs)
+-GTK_ST_LFLAGS += $(shell gtk-config --libs)
++GTK_ST_LFLAGS += $(shell pkg-config --libs libglade-2.0)
++GTK_ST_LFLAGS += $(shell pkg-config --libs gtk+-2.0)
GTK_ST_LFLAGS += -Wl,-Bdynamic
-GTK_SH_LFLAGS = -Wl,-Bstatic
- GTK_SH_LFLAGS += $(shell libglade-config --libs)
+-GTK_SH_LFLAGS += $(shell libglade-config --libs)
-GTK_SH_LFLAGS += -Wl,-Bdynamic
- GTK_SH_LFLAGS += $(shell gtk-config --libs)
+-GTK_SH_LFLAGS += $(shell gtk-config --libs)
++GTK_SH_LFLAGS += $(shell pkg-config --libs libglade-2.0)
++GTK_SH_LFLAGS += $(shell pkg-config --libs gtk+-2.0)
CORE_OBJS = loki_update.o prefpath.o url_paths.o meta_url.o \
+ load_products.o load_patchset.o patchset.o urlset.o \
@@ -61,7 +58,7 @@ OBJS = $(CORE_OBJS) $(SNARF_OBJS)
CORE_SRCS = $(CORE_OBJS:.o=.c)
@@ -32,3 +49,12 @@
gtk_sh_ui.so: gtk_ui.o
$(CC) -o $@ -shared $^ $(GTK_SH_LFLAGS)
+@@ -137,7 +134,7 @@ install-data:
+ LOCALES = fr
+
+ po/$(TARGET).po: $(CORE_SRCS) loki_update.glade
+- libglade-xgettext loki_update.glade > po/$(TARGET).po
++ xgettext --language=glade loki_update.glade -o po/$(TARGET).po
+ xgettext -p po -j -d $(TARGET) --keyword=_ $(CORE_SRCS)
+
+ update-po: po/$(TARGET).po
++++++ loki_update-libglade2.patch ++++++
Index: loki_update/gtk_ui.c
===================================================================
--- loki_update.orig/gtk_ui.c
+++ loki_update/gtk_ui.c
@@ -30,6 +30,10 @@
#include
participants (1)
-
root@Hilbert.suse.de