OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Aug-2005 19:44:16
Branch: HEAD Handle: 2005080218441600
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.4.0 -> 0.5.2
Summary:
Revision Changes Path
1.6 +12 -12 openpkg-src/libextractor/libextractor.patch
1.16 +11 -3 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 26 Dec 2004 08:42:26
-0000 1.5
+++ openpkg-src/libextractor/libextractor.patch 2 Aug 2005 17:44:16
-0000 1.6
@@ -2,7 +2,7 @@
--- src/main/Makefile.in.orig 2004-12-25 20:35:49 +0100
+++ src/main/Makefile.in 2004-12-26 09:10:05 +0100
@@ -75,6 +75,7 @@
- getopt1.$(OBJEXT)
+ getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
+extract_LDFLAGS = -static
@@ -21,15 +21,15 @@
-Wl,-Bsymbolic -avoid-version -module
# Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
-Index: src/plugins/printable/Makefile.in
---- src/plugins/printable/Makefile.in.orig 2004-12-25 19:34:54 +0100
-+++ src/plugins/printable/Makefile.in 2004-12-26 09:10:05 +0100
-@@ -444,7 +444,7 @@
- done
- dictionary-builder$(EXEEXT): $(dictionary_builder_OBJECTS)
$(dictionary_builder_DEPENDENCIES)
- @rm -f dictionary-builder$(EXEEXT)
-- $(LINK) $(dictionary_builder_LDFLAGS) $(dictionary_builder_OBJECTS)
$(dictionary_builder_LDADD) $(LIBS)
-+ $(LINK) $(dictionary_builder_LDFLAGS) $(dictionary_builder_OBJECTS)
$(dictionary_builder_LDADD) $(LIBINTL) $(LIBS)
+Index: src/plugins/thumbnail/Makefile.in
+--- src/plugins/thumbnail/Makefile.in.orig 2005-08-02 19:09:08 +0200
++++ src/plugins/thumbnail/Makefile.in 2005-08-02 19:17:46 +0200
+@@ -244,7 +244,7 @@
+ # Ok, linking this one is complicated, see Mantis #787.
+ libextractor_thumbnail_la_LDFLAGS = \
+ $(top_builddir)/src/main/libextractor.la \
+- -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
++ -Wl,-Bstatic -Wl,-lgobject2 -Wl,-lglib2 -Wl,-Bdynamic \
+ -Wl,-Bsymbolic -avoid-version -module
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
+ libextractor_thumbnail_la_LIBADD = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 24 Mar 2005 11:19:15
-0000 1.15
+++ openpkg-src/libextractor/libextractor.spec 2 Aug 2005 17:44:16
-0000 1.16
@@ -32,8 +32,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.4.0
-Release: 20041226
+Version: 0.5.2
+Release: 20050802
# list of sources
Source0:
http://ovmj.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -59,13 +59,20 @@
%track
prog libextractor = {
version = %{version}
- url = http://ovmj.org/libextractor/download.php3
+ url = http://gnunet.org/libextractor/download.php3
regex = libextractor-(__VER__)\.tar\.gz
}
%prep
%setup -q
%patch -p0
+ %{l_shtool} subst \
+ -e 's;\(dlflag = \)-ldl;\1;' \
+ src/main/Makefile.in
+ %{l_shtool} subst \
+ -e 's;@LIBICONV@;;' \
+ -e 's;@LTLIBINTL@ @LIBS@;@LIBS@;' \
+ src/plugins/Makefile.in src/plugins/*/Makefile.in
%build
CC="%{l_cc}" \
@@ -78,6 +85,7 @@
--prefix=%{l_prefix} \
--libdir=%{l_prefix}/lib/libextractor \
--enable-shared \
+ --enable-static \
--with-libintl-prefix=%{l_prefix}
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
