OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Nov-2006 22:17:57
Branch: HEAD Handle: 2006111121175700
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.5.14 -> 0.5.15
Summary:
Revision Changes Path
1.12 +82 -88 openpkg-src/libextractor/libextractor.patch
1.30 +3 -2 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 22 May 2006 09:37:15
-0000 1.11
+++ openpkg-src/libextractor/libextractor.patch 11 Nov 2006 21:17:57
-0000 1.12
@@ -1,19 +1,18 @@
Index: configure
---- configure.orig 2006-05-17 11:07:22 +0200
-+++ configure 2006-05-18 08:59:05 +0200
-@@ -31623,9 +31623,3 @@
+--- configure.orig 2006-09-06 23:07:19 +0200
++++ configure 2006-11-11 22:04:54 +0100
+@@ -35545,8 +35545,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; }; }
+- { echo "$as_me:$LINENO: NOTICE: libmpeg2 not found" >&5
+-echo "$as_me: NOTICE: libmpeg2 not found" >&6;}
-fi
Index: src/main/Makefile.in
---- src/main/Makefile.in.orig 2006-05-17 11:07:29 +0200
-+++ src/main/Makefile.in 2006-05-18 09:35:27 +0200
+--- src/main/Makefile.in.orig 2006-09-06 23:07:45 +0200
++++ src/main/Makefile.in 2006-11-11 22:04:54 +0100
@@ -70,6 +70,7 @@
getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
@@ -22,8 +21,8 @@
am_test_binary_OBJECTS = test_binary.$(OBJEXT)
test_binary_OBJECTS = $(am_test_binary_OBJECTS)
test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
-@@ -278,7 +279,8 @@
- -DPLUGIN_PATH="\"${plugindir}\""
+@@ -284,7 +285,8 @@
+ libextractor.la
extract_LDADD = \
- $(top_builddir)/src/main/libextractor.la
@@ -32,7 +31,7 @@
@MINGW_FALSE@@[EMAIL PROTECTED] = -ldl
@[EMAIL PROTECTED] = -lz
-@@ -287,7 +289,7 @@
+@@ -293,7 +295,7 @@
-export-dynamic -version-info 2:0:1 $(LIBICONV)
libextractor_la_LIBADD = \
@@ -42,18 +41,18 @@
libextractor_la_DEPENDENCIES = \
$(LIBLTDL)
Index: src/plugins/Makefile.in
---- 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
+--- src/plugins/Makefile.in.orig 2006-09-06 23:07:15 +0200
++++ src/plugins/Makefile.in 2006-11-11 22:11:16 +0100
+@@ -111,7 +111,7 @@
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 =
+ am__libextractor_mpeg_la_SOURCES_DIST = mpegextractor.c
[EMAIL PROTECTED]@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
[EMAIL PROTECTED]@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 @@
+@@ -186,7 +186,6 @@
@AMDEP_TRUE@ ./$(DEPDIR)/manextractor.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/mimeextractor.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/mp3extractor.Plo \
@@ -61,12 +60,12 @@
@AMDEP_TRUE@ ./$(DEPDIR)/oggextractor.Plo ./$(DEPDIR)/pack.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/pdfextractor.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/pngextractor.Plo \
-@@ -333,12 +332,12 @@
- ISOLOCALEDIR = @ISOLOCALEDIR@
+@@ -358,12 +357,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -76,33 +75,7 @@
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 @@
+@@ -920,7 +919,6 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -110,15 +83,36 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+@@ -1260,20 +1258,6 @@
+
+
+ install-exec-hook:
+- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
+- if test "$(thumbdir)" != ""; then \
+- if test "$(thumbqt)" != ""; then \
+- $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+-
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+- else \
+- $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
+-
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+- fi; \
+- else \
+- $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT);
\
+- fi;
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: src/plugins/exiv2/Makefile.in
---- 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@
+--- src/plugins/exiv2/Makefile.in.orig 2006-09-06 23:07:15 +0200
++++ src/plugins/exiv2/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -191,12 +191,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -129,14 +123,14 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/hash/Makefile.in
---- 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@
+--- src/plugins/hash/Makefile.in.orig 2006-09-06 23:07:15 +0200
++++ src/plugins/hash/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -180,12 +180,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -147,12 +141,12 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/ole2/Makefile.in
---- 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@
+--- src/plugins/ole2/Makefile.in.orig 2006-09-06 23:07:16 +0200
++++ src/plugins/ole2/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -162,12 +162,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
+LIBICONV =
LIBINTL = @LIBINTL@
@@ -165,12 +159,12 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/oo/Makefile.in
---- 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@
+--- src/plugins/oo/Makefile.in.orig 2006-09-06 23:07:16 +0200
++++ src/plugins/oo/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -166,12 +166,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
+LIBICONV =
LIBINTL = @LIBINTL@
@@ -183,14 +177,14 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/pdf/Makefile.in
---- 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@
+--- src/plugins/pdf/Makefile.in.orig 2006-09-06 23:07:16 +0200
++++ src/plugins/pdf/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -183,12 +183,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -201,14 +195,14 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/printable/Makefile.in
---- 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@
+--- src/plugins/printable/Makefile.in.orig 2006-09-06 23:07:17 +0200
++++ src/plugins/printable/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -492,12 +492,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -219,14 +213,14 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/rpm/Makefile.in
---- 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@
+--- src/plugins/rpm/Makefile.in.orig 2006-09-06 23:07:17 +0200
++++ src/plugins/rpm/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -165,12 +165,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
@@ -237,12 +231,12 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/thumbnail/Makefile.in
---- 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@
+--- src/plugins/thumbnail/Makefile.in.orig 2006-09-06 23:07:17 +0200
++++ src/plugins/thumbnail/Makefile.in 2006-11-11 22:04:54 +0100
+@@ -161,12 +161,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
+ LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
+LIBICONV =
LIBINTL = @LIBINTL@
@@ -254,12 +248,12 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-@@ -262,7 +262,7 @@
+@@ -271,7 +271,7 @@
$(GLIB_CFLAGS) $(GTK_CFLAGS)
- libextractor_thumbnail_la_LIBADD = \
+ libextractor_thumbnailgtk_la_LIBADD = \
- $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
+ $(LIBADD) -lgobject2 @GTK_LIBS@ \
$(top_builddir)/src/main/libextractor.la
- libextractor_thumbnail_la_LDFLAGS = \
+ libextractor_thumbnailgtk_la_LDFLAGS = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 13 Oct 2006 17:29:23
-0000 1.29
+++ openpkg-src/libextractor/libextractor.spec 11 Nov 2006 21:17:57
-0000 1.30
@@ -32,8 +32,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.5.14
-Release: 20061013
+Version: 0.5.15
+Release: 20061111
# list of sources
Source0:
http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -80,6 +80,7 @@
./configure \
--prefix=%{l_prefix} \
--libdir=%{l_prefix}/lib \
+ --mandir=%{l_prefix}/man \
--enable-shared \
--enable-static \
--enable-ltdl-install \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
