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: 14-Jul-2008 08:44:50
Branch: HEAD Handle: 2008071407444901
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.5.20b -> 0.5.20c
Summary:
Revision Changes Path
1.16 +78 -55 openpkg-src/libextractor/libextractor.patch
1.40 +2 -2 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 21 Mar 2008 12:22:26
-0000 1.15
+++ openpkg-src/libextractor/libextractor.patch 14 Jul 2008 06:44:49
-0000 1.16
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2008-03-21 06:40:45 +0100
-+++ configure 2008-03-21 12:44:50 +0100
-@@ -33577,20 +33577,6 @@
+--- configure.orig 2008-07-14 03:33:26 +0200
++++ configure 2008-07-14 08:34:09 +0200
+@@ -40732,20 +40732,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -23,9 +23,9 @@
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_GLIB\" was never
defined.
Usually this means the macro was only invoked conditionally." >&5
Index: src/main/Makefile.in
---- src/main/Makefile.in.orig 2008-03-21 06:40:55 +0100
-+++ src/main/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -79,6 +79,7 @@
+--- src/main/Makefile.in.orig 2008-07-14 03:33:39 +0200
++++ src/main/Makefile.in 2008-07-14 08:34:09 +0200
+@@ -90,6 +90,7 @@
getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
@@ -33,7 +33,7 @@
am_test_binary_OBJECTS = test_binary.$(OBJEXT)
test_binary_OBJECTS = $(am_test_binary_OBJECTS)
test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
-@@ -269,7 +270,8 @@
+@@ -313,7 +314,8 @@
libextractor.la
extract_LDADD = \
@@ -44,9 +44,9 @@
@MINGW_FALSE@@[EMAIL PROTECTED] = -ldl
@[EMAIL PROTECTED] = -lz
Index: src/plugins/Makefile.in
---- src/plugins/Makefile.in.orig 2008-03-21 06:40:55 +0100
-+++ src/plugins/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -187,7 +187,7 @@
+--- src/plugins/Makefile.in.orig 2008-07-14 03:33:45 +0200
++++ src/plugins/Makefile.in 2008-07-14 08:35:05 +0200
+@@ -199,7 +199,7 @@
$(libextractor_mp3_la_LDFLAGS) $(LDFLAGS) -o $@
libextractor_mpeg_la_DEPENDENCIES =
am__libextractor_mpeg_la_SOURCES_DIST = mpegextractor.c
@@ -55,7 +55,7 @@
libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
libextractor_mpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -467,12 +467,12 @@
+@@ -500,14 +500,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -63,36 +63,43 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
-@@ -1484,18 +1484,6 @@
+@@ -1532,23 +1532,6 @@
install-exec-hook:
- mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la
-- if test "$(thumbgtk)" != ""; then \
-- $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
+- if test "$(thumbffmpeg)" != ""; then \
+- $(LN_S) $(plugindir)/libextractor_thumbnailffmpeg$(LIBEXT) \
- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT);
\
- else \
-- if test "$(thumbqt)" != ""; then \
-- $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+- if test "$(thumbgtk)" != ""; then \
+- $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT)
\
-
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-- fi; \
-- fi;
+- else \
+- if test "$(thumbqt)" != ""; then \
+- $(LN_S)
$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+-
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+- fi \
+- fi \
+- 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 2008-03-21 06:40:56 +0100
-+++ src/plugins/exiv2/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -161,12 +161,12 @@
+--- src/plugins/exiv2/Makefile.in.orig 2008-07-14 03:33:45 +0200
++++ src/plugins/exiv2/Makefile.in 2008-07-14 08:35:23 +0200
+@@ -192,14 +192,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -100,17 +107,19 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/hash/Makefile.in
---- src/plugins/hash/Makefile.in.orig 2008-03-21 06:40:56 +0100
-+++ src/plugins/hash/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -168,12 +168,12 @@
+--- src/plugins/hash/Makefile.in.orig 2008-07-14 03:33:46 +0200
++++ src/plugins/hash/Makefile.in 2008-07-14 08:35:41 +0200
+@@ -199,14 +199,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -118,53 +127,59 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig 2008-03-21 06:40:56 +0100
-+++ src/plugins/ole2/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -142,12 +142,12 @@
+--- src/plugins/ole2/Makefile.in.orig 2008-07-14 03:33:46 +0200
++++ src/plugins/ole2/Makefile.in 2008-07-14 08:35:55 +0200
+@@ -173,14 +173,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/oo/Makefile.in
---- src/plugins/oo/Makefile.in.orig 2008-03-21 06:40:56 +0100
-+++ src/plugins/oo/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -148,12 +148,12 @@
+--- src/plugins/oo/Makefile.in.orig 2008-07-14 03:33:46 +0200
++++ src/plugins/oo/Makefile.in 2008-07-14 08:36:06 +0200
+@@ -179,14 +179,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/pdf/Makefile.in
---- src/plugins/pdf/Makefile.in.orig 2008-03-21 06:40:57 +0100
-+++ src/plugins/pdf/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -149,12 +149,12 @@
+--- src/plugins/pdf/Makefile.in.orig 2008-07-14 03:33:47 +0200
++++ src/plugins/pdf/Makefile.in 2008-07-14 08:36:20 +0200
+@@ -180,14 +180,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -172,17 +187,19 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/printable/Makefile.in
---- src/plugins/printable/Makefile.in.orig 2008-03-21 06:40:57 +0100
-+++ src/plugins/printable/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -325,12 +325,12 @@
+--- src/plugins/printable/Makefile.in.orig 2008-07-14 03:33:48 +0200
++++ src/plugins/printable/Makefile.in 2008-07-14 08:36:32 +0200
+@@ -356,14 +356,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -190,17 +207,19 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/rpm/Makefile.in
---- src/plugins/rpm/Makefile.in.orig 2008-03-21 06:40:57 +0100
-+++ src/plugins/rpm/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -147,12 +147,12 @@
+--- src/plugins/rpm/Makefile.in.orig 2008-07-14 03:33:48 +0200
++++ src/plugins/rpm/Makefile.in 2008-07-14 08:36:44 +0200
+@@ -178,14 +178,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -208,32 +227,36 @@
+LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
Index: src/plugins/thumbnail/Makefile.in
---- src/plugins/thumbnail/Makefile.in.orig 2008-03-21 06:40:58 +0100
-+++ src/plugins/thumbnail/Makefile.in 2008-03-21 12:44:50 +0100
-@@ -141,12 +141,12 @@
+--- src/plugins/thumbnail/Makefile.in.orig 2008-07-14 03:33:48 +0200
++++ src/plugins/thumbnail/Makefile.in 2008-07-14 08:36:57 +0200
+@@ -172,14 +172,14 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
-LIBICONV = @LIBICONV@
-+LIBICONV =
++LIBICONV =
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
LIBS = \
- @LTLIBINTL@ @LIBS@
+ @LIBS@
+ LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
-@@ -254,7 +254,7 @@
+@@ -295,7 +295,7 @@
$(GLIB_CFLAGS) $(GTK_CFLAGS)
libextractor_thumbnailgtk_la_LIBADD = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 26 Apr 2008 07:24:46
-0000 1.39
+++ openpkg-src/libextractor/libextractor.spec 14 Jul 2008 06:44:50
-0000 1.40
@@ -31,8 +31,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.5.20b
-Release: 20080426
+Version: 0.5.20c
+Release: 20080714
# list of sources
Source0:
http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
