From 1d8016a9d697eb8a4812cc3ea1cd7eb00e086863 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 10 Jan 2010 10:29:59 +0000 Subject: [PATCH] upgrading package: libextractor 0.5.20c -> 0.5.23 --- libextractor/libextractor.patch | 267 -------------------------------- libextractor/libextractor.spec | 20 ++- 2 files changed, 9 insertions(+), 278 deletions(-) delete mode 100644 libextractor/libextractor.patch diff --git a/libextractor/libextractor.patch b/libextractor/libextractor.patch deleted file mode 100644 index 049d8c0fd5..0000000000 --- a/libextractor/libextractor.patch +++ /dev/null @@ -1,267 +0,0 @@ -Index: configure ---- 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 --if test -z "${HAVE_MPEG2_TRUE}" && test -z "${HAVE_MPEG2_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"HAVE_MPEG2\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"HAVE_MPEG2\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_MPEG2_TRUE}" && test -z "${HAVE_MPEG2_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"HAVE_MPEG2\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"HAVE_MPEG2\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi - if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then - { { 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-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 -+extract_LDFLAGS = -static - am_test_binary_OBJECTS = test_binary.$(OBJEXT) - test_binary_OBJECTS = $(am_test_binary_OBJECTS) - test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la -@@ -313,7 +314,8 @@ - libextractor.la - - 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 -Index: src/plugins/Makefile.in ---- 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 --@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo -+@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = - 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) \ -@@ -500,14 +500,14 @@ - LDFLAGS = @LDFLAGS@ - LIBADD_DL = @LIBADD_DL@ - LIBEXT = @LIBEXT@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -@@ -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 "$(thumbffmpeg)" != ""; then \ -- $(LN_S) $(plugindir)/libextractor_thumbnailffmpeg$(LIBEXT) \ -- $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \ -- else \ -- 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); \ -- 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-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@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/hash/Makefile.in ---- 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@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/ole2/Makefile.in ---- 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 = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/oo/Makefile.in ---- 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 = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/pdf/Makefile.in ---- 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@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/printable/Makefile.in ---- 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@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/rpm/Makefile.in ---- 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@ --LIBICONV = @LIBICONV@ -+LIBICONV = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -Index: src/plugins/thumbnail/Makefile.in ---- 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 = - LIBINTL = @LIBINTL@ - LIBLTDL = @LIBLTDL@ - LIBMULTITHREAD = @LIBMULTITHREAD@ - LIBOBJS = @LIBOBJS@ - LIBPTH = @LIBPTH@ - LIBS = \ -- @LTLIBINTL@ @LIBS@ -+ @LIBS@ - - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -@@ -295,7 +295,7 @@ - $(GLIB_CFLAGS) $(GTK_CFLAGS) - - libextractor_thumbnailgtk_la_LIBADD = \ -- $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \ -+ $(LIBADD) -lgobject2 @GTK_LIBS@ \ - $(top_builddir)/src/main/libextractor.la - - libextractor_thumbnailgtk_la_LDFLAGS = \ diff --git a/libextractor/libextractor.spec b/libextractor/libextractor.spec index b3bb70e617..c92dacf190 100644 --- a/libextractor/libextractor.spec +++ b/libextractor/libextractor.spec @@ -31,21 +31,20 @@ Distribution: OpenPKG Community Class: EVAL Group: Filesystem License: GPL -Version: 0.5.20c -Release: 20080714 +Version: 0.5.23 +Release: 20100110 # list of sources -Source0: http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz +Source0: ftp://ftp.gnu.org/gnu/libextractor/libextractor-%{version}.tar.gz Source1: libextractor.pc -Patch0: libextractor.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make PreReq: OpenPKG, openpkg >= 20040130 -BuildPreReq: gettext, libiconv, bzip2, zlib -PreReq: gettext, libiconv, bzip2, zlib +BuildPreReq: gettext, libiconv, bzip2, zlib, flac +PreReq: gettext, libiconv, bzip2, zlib, flac AutoReq: no AutoReqProv: no @@ -61,13 +60,12 @@ AutoReqProv: no %track prog libextractor = { version = %{version} - url = http://gnunet.org/libextractor/download.php3 + url = ftp://ftp.gnu.org/gnu/libextractor/ regex = libextractor-(__VER__)\.tar\.gz } %prep %setup -q - %patch -p0 %build CC="%{l_cc}" \ @@ -98,13 +96,13 @@ AutoReqProv: no %{l_shtool} subst \ -e 's;^\(dlname=.\).*\(.\);\1\2;' \ -e 's;^\(library_names=.\).*\(.\);\1\2;' \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor.la + $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor.la \ + $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor_common.la strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale 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 rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor.so* + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor_common.so* mv $RPM_BUILD_ROOT%{l_prefix}/lib/libltdl.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor_ltdl.a rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libltdl.*