work-off packaging

libextractor/libextractor.patch

@@ -1,7 +1,20 @@
+Index: configure
+--- configure.orig	2006-05-17 11:07:22 +0200
++++ configure	2006-05-18 08:59:05 +0200
+@@ -31623,9 +31623,3 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-if test "x$HAVE_MPEG2_TRUE" = "x#"
+-then
+- { { echo "$as_me:$LINENO: error: FATAL: libmpeg2 not found" >&5
+-echo "$as_me: error: FATAL: libmpeg2 not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
 Index: src/main/Makefile.in
---- src/main/Makefile.in.orig	2006-04-22 20:33:16 +0200
-+++ src/main/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -69,6 +69,7 @@
+--- src/main/Makefile.in.orig	2006-05-17 11:07:29 +0200
++++ src/main/Makefile.in	2006-05-18 09:35:27 +0200
+@@ -70,6 +70,7 @@
  	getopt1.$(OBJEXT)
  extract_OBJECTS = $(am_extract_OBJECTS)
  extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
@@ -9,7 +22,17 @@ 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
-@@ -272,7 +273,7 @@
+@@ -278,7 +279,8 @@
+   -DPLUGIN_PATH="\"${plugindir}\""
+ 
+ extract_LDADD = \
+-  $(top_builddir)/src/main/libextractor.la 
++  $(top_builddir)/src/main/libextractor.la \
++  $(top_builddir)/libltdl/libltdl.la
+ 
+ @MINGW_FALSE@@SOMEBSD_FALSE@dlflag = -ldl
+ @HAVE_ZLIB_TRUE@zlib = -lz
+@@ -287,7 +289,7 @@
    -export-dynamic -version-info 2:0:1 $(LIBICONV)
  
  libextractor_la_LIBADD = \
@@ -19,10 +42,27 @@ Index: src/main/Makefile.in
  libextractor_la_DEPENDENCIES = \
    $(LIBLTDL) 
 Index: src/plugins/Makefile.in
---- src/plugins/Makefile.in.orig	2006-04-22 20:33:17 +0200
-+++ src/plugins/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -326,12 +326,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/Makefile.in.orig	2006-05-17 11:07:30 +0200
++++ src/plugins/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -110,7 +110,7 @@
+ am_libextractor_mp3_la_OBJECTS = mp3extractor.lo
+ libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
+ libextractor_mpeg_la_DEPENDENCIES =
+-am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
++am_libextractor_mpeg_la_OBJECTS = 
+ libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
+ libextractor_ogg_la_LIBADD =
+ am__libextractor_ogg_la_SOURCES_DIST = oggextractor.c
+@@ -180,7 +180,6 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/manextractor.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/mimeextractor.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/mp3extractor.Plo \
+-@AMDEP_TRUE@	./$(DEPDIR)/mpegextractor.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/oggextractor.Plo ./$(DEPDIR)/pack.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/pdfextractor.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/pngextractor.Plo \
+@@ -333,12 +332,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -36,11 +76,45 @@ Index: src/plugins/Makefile.in
  
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
+@@ -462,7 +461,6 @@
+   libextractor_man.la \
+   libextractor_mime.la \
+   libextractor_mp3.la \
+-  libextractor_mpeg.la \
+   $(extraogg) \
+   libextractor_png.la \
+   libextractor_ps.la \
+@@ -654,15 +652,11 @@
+   $(top_builddir)/src/main/libextractor.la \
+   $(PLUGINFLAGS)  $(retaincommand)
+ 
+-libextractor_mpeg_la_SOURCES = \
+-  mpegextractor.c 
++libextractor_mpeg_la_SOURCES =
+ 
+-libextractor_mpeg_la_LDFLAGS = \
+-  $(top_builddir)/src/main/libextractor.la \
+-  $(PLUGINFLAGS)  $(retaincommand)
++libextractor_mpeg_la_LDFLAGS =
+ 
+ libextractor_mpeg_la_LIBADD = \
+-  -lmpeg2
+ 
+ libextractor_man_la_SOURCES = \
+   manextractor.c 
+@@ -877,7 +871,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manextractor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mimeextractor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3extractor.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegextractor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oggextractor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdfextractor.Plo@am__quote@
 Index: src/plugins/exiv2/Makefile.in
---- src/plugins/exiv2/Makefile.in.orig	2006-04-22 20:33:18 +0200
-+++ src/plugins/exiv2/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -177,12 +177,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/exiv2/Makefile.in.orig	2006-05-17 11:07:31 +0200
++++ src/plugins/exiv2/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -185,12 +185,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -55,10 +129,10 @@ Index: src/plugins/exiv2/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/hash/Makefile.in
---- src/plugins/hash/Makefile.in.orig	2006-04-22 20:33:18 +0200
-+++ src/plugins/hash/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -166,12 +166,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/hash/Makefile.in.orig	2006-05-17 11:07:31 +0200
++++ src/plugins/hash/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -174,12 +174,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -73,10 +147,10 @@ Index: src/plugins/hash/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig	2006-04-22 20:33:19 +0200
-+++ src/plugins/ole2/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -147,12 +147,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/ole2/Makefile.in.orig	2006-05-17 11:07:31 +0200
++++ src/plugins/ole2/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -156,12 +156,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -90,20 +164,11 @@ Index: src/plugins/ole2/Makefile.in
  
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
-@@ -247,7 +247,7 @@
-   $(GLIB_CFLAGS) 
- 
- libextractor_ole2_la_LIBADD = \
--  $(LIBADD) $(GLIB_LIBS) -lgobject-2.0 \
-+  $(LIBADD) $(GLIB_LIBS) -lgobject2 \
-   $(top_builddir)/src/main/libextractor.la
- 
- libextractor_ole2_la_LDFLAGS = \
 Index: src/plugins/oo/Makefile.in
---- src/plugins/oo/Makefile.in.orig	2006-04-22 20:33:19 +0200
-+++ src/plugins/oo/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -152,12 +152,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/oo/Makefile.in.orig	2006-05-17 11:07:32 +0200
++++ src/plugins/oo/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -160,12 +160,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -118,10 +183,10 @@ Index: src/plugins/oo/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/pdf/Makefile.in
---- src/plugins/pdf/Makefile.in.orig	2006-04-22 20:33:20 +0200
-+++ src/plugins/pdf/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -173,12 +173,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/pdf/Makefile.in.orig	2006-05-17 11:07:32 +0200
++++ src/plugins/pdf/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -177,12 +177,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -136,10 +201,10 @@ Index: src/plugins/pdf/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/printable/Makefile.in
---- src/plugins/printable/Makefile.in.orig	2006-04-22 20:33:21 +0200
-+++ src/plugins/printable/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -478,12 +478,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/printable/Makefile.in.orig	2006-05-17 11:07:33 +0200
++++ src/plugins/printable/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -486,12 +486,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -154,10 +219,10 @@ Index: src/plugins/printable/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/rpm/Makefile.in
---- src/plugins/rpm/Makefile.in.orig	2006-04-22 20:33:21 +0200
-+++ src/plugins/rpm/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -151,12 +151,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/rpm/Makefile.in.orig	2006-05-17 11:07:33 +0200
++++ src/plugins/rpm/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -159,12 +159,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -172,10 +237,10 @@ Index: src/plugins/rpm/Makefile.in
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
 Index: src/plugins/thumbnail/Makefile.in
---- src/plugins/thumbnail/Makefile.in.orig	2006-04-22 20:33:22 +0200
-+++ src/plugins/thumbnail/Makefile.in	2006-05-07 08:34:20 +0200
-@@ -147,12 +147,12 @@
- INTLLIBS = @INTLLIBS@
+--- src/plugins/thumbnail/Makefile.in.orig	2006-05-17 11:07:33 +0200
++++ src/plugins/thumbnail/Makefile.in	2006-05-18 08:59:05 +0200
+@@ -155,12 +155,12 @@
+ ISOLOCALEDIR = @ISOLOCALEDIR@
  LDFLAGS = @LDFLAGS@
  LIBADD_DL = @LIBADD_DL@
 -LIBICONV = @LIBICONV@
@@ -189,7 +254,7 @@ Index: src/plugins/thumbnail/Makefile.in
  
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
-@@ -247,7 +247,7 @@
+@@ -262,7 +262,7 @@
    $(GLIB_CFLAGS) $(GTK_CFLAGS)
  
  libextractor_thumbnail_la_LIBADD = \

libextractor/libextractor.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Filesystem
 License:      GPL
-Version:      0.5.12
-Release:      20060516
+Version:      0.5.14
+Release:      20060522
 
 #   list of sources
 Source0:      http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -78,10 +78,15 @@ AutoReqProv:  no
     LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
-        --libdir=%{l_prefix}/lib/libextractor \
+        --libdir=%{l_prefix}/lib \
         --enable-shared \
         --enable-static \
-        --with-libintl-prefix=%{l_prefix}
+        --enable-ltdl-install \
+        --with-libintl-prefix=%{l_prefix} \
+        --disable-xpdf \
+        --disable-exiv2 \
+        --disable-gsf \
+        --disable-gnome
     %{l_make} %{l_mflags}
 
 %install
@@ -92,8 +97,9 @@ AutoReqProv:  no
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor/libextractor_*.a
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor/libextractor.so*
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor/libextractor.la
-    mv  $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor/libextractor.a \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor.so*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/libltdl.*
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/include/ltdl.h
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files