[libgsf] compilation: remove gnome leftovers

[Morten Welinder <mortenw src gnome org>]

commit 46c1e1d008ba210e2fbba0899d235452e2f1be5b
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 7 15:57:30 2011 -0500

    compilation: remove gnome leftovers

 gsf/Makefile.am   |    5 +++--
 gsf/gsf-utils.c   |    2 +-
 libgsf-1.spec.in  |    2 +-
 libgsf-zip.in     |   19 +------------------
 tools/Makefile.am |    9 +++++----
 5 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/gsf/Makefile.am b/gsf/Makefile.am
index b09a2fe..d933b34 100644
--- a/gsf/Makefile.am
+++ b/gsf/Makefile.am
@@ -1,5 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(Z_CPPFLAGS) $(LIBGSF_GIO_CFLAGS) \
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
+	$(Z_CPPFLAGS) $(LIBGSF_GIO_CFLAGS) \
+	-DGSFLOCALEDIR=\"$(datadir)/locale\"
 
 lib_LTLIBRARIES = libgsf-1.la
 
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index 36c620f..f655a2c 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -146,7 +146,7 @@ gsf_init (void)
 		g_free (pkg_dir);
 	}
 #else
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, GSFLOCALEDIR);
 #endif
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
diff --git a/libgsf-1.spec.in b/libgsf-1.spec.in
index 49335ea..74ca1ac 100644
--- a/libgsf-1.spec.in
+++ b/libgsf-1.spec.in
@@ -11,7 +11,7 @@ Release: %{release}
 Group: System Environment/Libraries
 License: LGPL
 
-Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/libgsf/%{name}-%{version}.tar.gz
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgsf/%{name}-%{version}.tar.gz
 Buildroot: /var/tmp/%{name}-%{version}-%{release}-root
 URL: http://www.gnumeric.org
 
diff --git a/libgsf-zip.in b/libgsf-zip.in
index babf8e7..3911b54 100755
--- a/libgsf-zip.in
+++ b/libgsf-zip.in
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-# Build runtime and developer zipfiles for libgsf and libgsf-gnome for
-# Win32.
+# Build runtime and developer zipfiles for libgsf for Win32.
 
 ZIP=/tmp/libgsf- VERSION@.zip
 DEVZIP=/tmp/libgsf-dev- VERSION@.zip
-GNOMEZIP=/tmp/libgsf-gnome- VERSION@.zip
-GNOMEDEVZIP=/tmp/libgsf-gnome-dev- VERSION@.zip
 
 cd @prefix@
 
@@ -18,12 +15,6 @@ EOF
 
 zip $ZIP share/locale/*/LC_MESSAGES/libgsf.mo
 
-rm $GNOMEZIP
-zip $GNOMEZIP -@ <<EOF
-etc/gconf/schemas/gsf-office-thumbnailer.schemas
-bin/libgsf-gnome-1- CURRENT_MINUS_AGE@.dll
-EOF
-
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/libgsf-1/gsf
@@ -33,11 +24,3 @@ lib/libgsf-win32-1.dll.a
 lib/pkgconfig/libgsf-1.pc
 lib/pkgconfig/libgsf-win32-1.pc
 EOF
-
-rm $GNOMEDEVZIP
-zip -r $GNOMEDEVZIP -@ <<EOF
-bin/gsf-office-thumbnailer.exe
-include/libgsf-1/gsf-gnome
-lib/libgsf-gnome-1.dll.a
-lib/pkgconfig/libgsf-gnome-1.pc
-EOF
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4b12fb7..9ab6852 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,8 @@
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(Z_CPPFLAGS) \
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
+	$(Z_CPPFLAGS) \
+	-DGSFLOCALEDIR=\"$(datadir)/locale\"
 LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
 
 bin_PROGRAMS = gsf gsf-vba-dump
-gsf_SOURCES		= gsf.c
-gsf_vba_dump_SOURCES	= gsf-vba-dump.c
+gsf_SOURCES = gsf.c
+gsf_vba_dump_SOURCES = gsf-vba-dump.c