File gnome-libs-system-popt.patch of Package gnome-libs

Index: libgnome/gnome-popt.h
===================================================================
--- libgnome/gnome-popt.h.orig
+++ libgnome/gnome-popt.h
@@ -7,7 +7,7 @@
 BEGIN_GNOME_DECLS
 
 /* This is here because it does not have its own #ifdef __cplusplus */
-#include <popt-gnome.h>
+#include <popt.h>
 
 void gnomelib_register_popt_table(const struct poptOption *options,
 				  const char *description);
Index: support/Makefile.am
===================================================================
--- support/Makefile.am.orig
+++ support/Makefile.am
@@ -13,16 +13,10 @@ supportexecinclude_DATA = gnomesupport.h
 # These are internal headers: they are used only when compiling and
 # should not be installed
 noinst_HEADERS = gnomesupport-fake.h \
-		 findme.h poptint.h
+		 findme.h
 
-# Hmm... should we move `error.h' here.
-gnomeincludedir=$(includedir)/gnome-1.0
-gnomeinclude_HEADERS = popt-gnome.h
-
-popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
-
-libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
-libgnomesupport_la_LIBADD  = @LTLIBOBJS@
+libgnomesupport_la_SOURCES = gnomesupport.h gnome-argp.c
+libgnomesupport_la_LIBADD  = @LTLIBOBJS@ -lpopt
 libgnomesupport_la_LDFLAGS = -version-info 0:0:0
 
 BUILT_SOURCES = gnomesupport.h
@@ -39,7 +33,7 @@ EXTRA_DIST = gnomesupport.awk README-gno
 	canonicalize.c easy-vsnprintf.c error.c error.h \
 	findme.c findme.h getopt.c getopt.h getopt1.c \
 	gnome-argp.c gnome-argp.h gnomesupport-fake.h \
-	memmove.c mkstemp.c popt-gnome.h popt.c poptconfig.c \
-	popthelp.c poptint.h poptparse.c scandir.c strcasecmp.c \
+	memmove.c mkstemp.c \
+	scandir.c strcasecmp.c \
 	strerror.c strndup.c strnlen.c strtod.c strtok_r.c strtol.c \
 	strtoul.c vasprintf.c vsnprintf.c
Index: libgnome/Makefile.am
===================================================================
--- libgnome/Makefile.am.orig
+++ libgnome/Makefile.am
@@ -87,7 +87,7 @@ EXTRA_DIST = parse-path.cP $(man_MANS)
 gnome-config.o: parse-path.cP
 
 libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
-libgnome_la_LIBADD = $(GLIB_LIBS) -lm
+libgnome_la_LIBADD = ../support/libgnomesupport.la $(GLIB_LIBS) -lm
 
 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
 	gconfigger gnome-gen-mimedb