upgrading package: libextractor 0.5.7 -> 0.5.11

libextractor/libextractor.patch

@@ -1,6 +1,6 @@
 Index: src/main/Makefile.in
---- src/main/Makefile.in.orig	2005-09-08 06:46:36 +0200
-+++ src/main/Makefile.in	2005-09-09 10:10:51 +0200
+--- src/main/Makefile.in.orig	2006-03-11 03:01:59 +0100
++++ src/main/Makefile.in	2006-05-04 10:07:10 +0200
 @@ -69,6 +69,7 @@
  	getopt1.$(OBJEXT)
  extract_OBJECTS = $(am_extract_OBJECTS)
@@ -9,7 +9,7 @@ Index: src/main/Makefile.in
  am_test_binary_OBJECTS = test_binary.$(OBJEXT)
  test_binary_OBJECTS = $(am_test_binary_OBJECTS)
  test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
-@@ -273,7 +274,7 @@
+@@ -270,7 +271,7 @@
    -export-dynamic -version-info 2:0:1 $(LIBICONV)
  
  libextractor_la_LIBADD = \
@@ -18,10 +18,79 @@ Index: src/main/Makefile.in
  
  libextractor_la_DEPENDENCIES = \
    $(LIBLTDL) 
+Index: src/plugins/Makefile.in
+--- src/plugins/Makefile.in.orig	2006-03-11 08:22:45 +0100
++++ src/plugins/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -319,12 +319,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+Index: src/plugins/exiv2/Makefile.in
+--- src/plugins/exiv2/Makefile.in.orig	2006-03-11 03:02:00 +0100
++++ src/plugins/exiv2/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -175,12 +175,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+Index: src/plugins/hash/Makefile.in
+--- src/plugins/hash/Makefile.in.orig	2006-03-11 03:02:00 +0100
++++ src/plugins/hash/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -164,12 +164,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
 Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig	2005-09-08 06:46:38 +0200
-+++ src/plugins/ole2/Makefile.in	2005-09-09 10:04:37 +0200
-@@ -240,7 +240,7 @@
+--- src/plugins/ole2/Makefile.in.orig	2006-03-11 03:02:01 +0100
++++ src/plugins/ole2/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -145,12 +145,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+@@ -245,7 +245,7 @@
    $(GLIB_CFLAGS) 
  
  libextractor_ole2_la_LIBADD = \
@@ -30,11 +99,98 @@ Index: src/plugins/ole2/Makefile.in
    $(top_builddir)/src/main/libextractor.la
  
  libextractor_ole2_la_LDFLAGS = \
+Index: src/plugins/oo/Makefile.in
+--- src/plugins/oo/Makefile.in.orig	2006-03-11 03:02:01 +0100
++++ src/plugins/oo/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -150,12 +150,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+Index: src/plugins/pdf/Makefile.in
+--- src/plugins/pdf/Makefile.in.orig	2006-03-11 03:02:01 +0100
++++ src/plugins/pdf/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -171,12 +171,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+Index: src/plugins/printable/Makefile.in
+--- src/plugins/printable/Makefile.in.orig	2006-03-11 03:02:02 +0100
++++ src/plugins/printable/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -202,12 +202,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+Index: src/plugins/rpm/Makefile.in
+--- src/plugins/rpm/Makefile.in.orig	2006-03-11 03:02:02 +0100
++++ src/plugins/rpm/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -149,12 +149,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
 Index: src/plugins/thumbnail/Makefile.in
---- src/plugins/thumbnail/Makefile.in.orig	2005-09-08 06:46:39 +0200
-+++ src/plugins/thumbnail/Makefile.in	2005-09-09 10:04:37 +0200
-@@ -241,7 +241,7 @@
-   $(GLIB_CFLAGS)
+--- src/plugins/thumbnail/Makefile.in.orig	2006-03-11 03:02:02 +0100
++++ src/plugins/thumbnail/Makefile.in	2006-05-04 10:07:10 +0200
+@@ -145,12 +145,12 @@
+ INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+-LIBICONV = @LIBICONV@
++LIBICONV = 
+ LIBINTL = @LIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBS = \
+- @LTLIBINTL@ @LIBS@
++ @LIBS@
+ 
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+@@ -245,7 +245,7 @@
+   $(GLIB_CFLAGS) $(GTK_CFLAGS)
  
  libextractor_thumbnail_la_LIBADD = \
 -  $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
@@ -42,3 +198,57 @@ Index: src/plugins/thumbnail/Makefile.in
    $(top_builddir)/src/main/libextractor.la 
  
  libextractor_thumbnail_la_LDFLAGS = \
+Index: src/plugins/wordleaker/Makefile.in
+--- src/plugins/wordleaker/Makefile.in.orig	2006-03-11 03:02:02 +0100
++++ src/plugins/wordleaker/Makefile.in	2006-05-04 10:20:49 +0200
+@@ -14,6 +14,11 @@
+ 
+ @SET_MAKE@
+ 
++GLIB_CFLAGS = @GLIB_CFLAGS@
++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
++GLIB_LIBS = @GLIB_LIBS@
++GLIB_MKENUMS = @GLIB_MKENUMS@
++
+ SOURCES = $(libextractor_word_la_SOURCES)
+ 
+ srcdir = @srcdir@
+@@ -66,15 +71,15 @@
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pole.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/wordextractor.Plo
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++CXXCOMPILE = $(CXX) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(GLIB_CFLAGS) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = $(CC) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+Index: src/plugins/wordleaker/wordextractor.cc
+--- src/plugins/wordleaker/wordextractor.cc.orig	2006-03-11 01:10:50 +0100
++++ src/plugins/wordleaker/wordextractor.cc	2006-05-04 10:15:28 +0200
+@@ -30,6 +30,7 @@
+ 
+ #include "wordleaker.h"
+ #include "pole.h"
++#include "glib/gstrfuncs.h"
+ 
+ 
+ extern "C" {
+@@ -84,7 +85,7 @@
+ 		      &t))
+       return NULL;
+       
+-    return strndup(f, 128);
++    return g_strndup(f, 128);
+   }
+   
+   static const char * idToProduct( unsigned int id ) {

libextractor/libextractor.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Filesystem
 License:      GPL
-Version:      0.5.7
-Release:      20051207
+Version:      0.5.11
+Release:      20060504
 
 #   list of sources
 Source0:      http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -66,10 +66,6 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
-    %{l_shtool} subst \
-        -e 's;@LIBICONV@;;' \
-        -e 's;@LTLIBINTL@ @LIBS@;@LIBS@;' \
-        src/plugins/Makefile.in src/plugins/*/Makefile.in
 
 %build
     CC="%{l_cc}" \