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: 21-Mar-2008 13:22:27
Branch: HEAD Handle: 2008032112222600
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.5.18 -> 0.5.20
Summary:
Revision Changes Path
1.15 +46 -49 openpkg-src/libextractor/libextractor.patch
1.37 +5 -2 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 4 Jan 2007 17:10:46
-0000 1.14
+++ openpkg-src/libextractor/libextractor.patch 21 Mar 2008 12:22:26
-0000 1.15
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2007-01-03 04:14:39 +0100
-+++ configure 2007-01-04 08:55:01 +0100
-@@ -30450,20 +30450,6 @@
+--- configure.orig 2008-03-21 06:40:45 +0100
++++ configure 2008-03-21 12:44:50 +0100
+@@ -33577,20 +33577,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 2007-01-03 04:14:47 +0100
-+++ src/main/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -73,6 +73,7 @@
+--- 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 @@
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
-@@ -293,7 +294,8 @@
+@@ -269,7 +270,8 @@
libextractor.la
extract_LDADD = \
@@ -44,18 +44,18 @@
@MINGW_FALSE@@[EMAIL PROTECTED] = -ldl
@[EMAIL PROTECTED] = -lz
Index: src/plugins/Makefile.in
---- src/plugins/Makefile.in.orig 2007-01-03 04:14:48 +0100
-+++ src/plugins/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -112,7 +112,7 @@
- libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
+--- 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 @@
+ $(libextractor_mp3_la_LDFLAGS) $(LDFLAGS) -o $@
libextractor_mpeg_la_DEPENDENCIES =
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_nsf_la_DEPENDENCIES = \
- $(top_builddir)/src/main/libextractor.la
-@@ -374,12 +374,12 @@
+ libextractor_mpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -467,12 +467,12 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -70,32 +70,29 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-@@ -1336,21 +1336,6 @@
+@@ -1484,18 +1484,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 "$(thumbdir)" != ""; then \
+- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
+- rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la
+- if test "$(thumbgtk)" != ""; then \
+- $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
+- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT);
\
+- else \
- if test "$(thumbqt)" != ""; then \
- $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-- else \
-- $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT)
\
--
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
- fi; \
-- else \
-- $(LN_S) $(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 2007-01-03 04:14:48 +0100
-+++ src/plugins/exiv2/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -192,12 +192,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -111,9 +108,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/hash/Makefile.in
---- src/plugins/hash/Makefile.in.orig 2007-01-03 04:14:48 +0100
-+++ src/plugins/hash/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -181,12 +181,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -129,9 +126,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig 2007-01-03 04:14:49 +0100
-+++ src/plugins/ole2/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -163,12 +163,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -147,9 +144,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/oo/Makefile.in
---- src/plugins/oo/Makefile.in.orig 2007-01-03 04:14:49 +0100
-+++ src/plugins/oo/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -167,12 +167,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -165,9 +162,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/pdf/Makefile.in
---- src/plugins/pdf/Makefile.in.orig 2007-01-03 04:14:49 +0100
-+++ src/plugins/pdf/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -184,12 +184,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -183,9 +180,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/printable/Makefile.in
---- src/plugins/printable/Makefile.in.orig 2007-01-03 04:14:50 +0100
-+++ src/plugins/printable/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -493,12 +493,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -201,9 +198,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/rpm/Makefile.in
---- src/plugins/rpm/Makefile.in.orig 2007-01-03 04:14:50 +0100
-+++ src/plugins/rpm/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -166,12 +166,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -219,9 +216,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/thumbnail/Makefile.in
---- src/plugins/thumbnail/Makefile.in.orig 2007-01-03 04:14:51 +0100
-+++ src/plugins/thumbnail/Makefile.in 2007-01-04 08:53:22 +0100
-@@ -162,12 +162,12 @@
+--- 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 @@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBEXT = @LIBEXT@
@@ -236,7 +233,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-@@ -278,7 +278,7 @@
+@@ -254,7 +254,7 @@
$(GLIB_CFLAGS) $(GTK_CFLAGS)
libextractor_thumbnailgtk_la_LIBADD = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 1 Jan 2008 14:56:51
-0000 1.36
+++ openpkg-src/libextractor/libextractor.spec 21 Mar 2008 12:22:26
-0000 1.37
@@ -31,8 +31,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.5.18
-Release: 20080101
+Version: 0.5.20
+Release: 20080321
# list of sources
Source0:
http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -80,10 +80,12 @@
--prefix=%{l_prefix} \
--libdir=%{l_prefix}/lib \
--mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--enable-shared \
--enable-static \
--enable-ltdl-install \
--with-libintl-prefix=%{l_prefix} \
+ --without-qt \
--disable-xpdf \
--disable-exiv2 \
--disable-gsf \
@@ -107,6 +109,7 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/libextractor_ltdl.a
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libltdl.*
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/ltdl.h
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
