OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Nov-2004 10:57:51
Branch: HEAD Handle: 2004111609575000
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.3.10 -> 0.3.11
Summary:
Revision Changes Path
1.4 +24 -16 openpkg-src/libextractor/libextractor.patch
1.12 +2 -2 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 18 Oct 2004 07:56:55
-0000 1.3
+++ openpkg-src/libextractor/libextractor.patch 16 Nov 2004 09:57:50
-0000 1.4
@@ -1,6 +1,6 @@
Index: src/main/Makefile.in
---- src/main/Makefile.in.orig 2004-10-18 01:22:14 +0200
-+++ src/main/Makefile.in 2004-10-18 09:34:31 +0200
+--- src/main/Makefile.in.orig 2004-11-13 19:25:52 +0100
++++ src/main/Makefile.in 2004-11-16 10:51:42 +0100
@@ -68,6 +68,7 @@
getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
@@ -9,9 +9,29 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+Index: src/plugins/ole2/Makefile.in
+--- src/plugins/ole2/Makefile.in.orig 2004-11-13 19:25:54 +0100
++++ src/plugins/ole2/Makefile.in 2004-11-16 10:52:57 +0100
+@@ -225,14 +225,14 @@
+ libextractor_ole2.la
+
+ AM_CFLAGS = $(GLIB_CFLAGS)
[EMAIL PROTECTED]@WINFLAGS = -lgobject-2.0 $(GLIB_LIBS)
[EMAIL PROTECTED]@WINFLAGS = -lgobject2 $(GLIB_LIBS)
+ libextractor_ole2_la_LIBADD = \
+ $(LIBADD) $(WINFLAGS) \
+ $(top_builddir)/src/main/libextractor.la
+
+ # Ok, linking this one is complicated, see Mantis #787.
+ libextractor_ole2_la_LDFLAGS = \
+- -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
+
+ # 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-10-18 01:22:16 +0200
-+++ src/plugins/printable/Makefile.in 2004-10-18 09:34:31 +0200
+--- src/plugins/printable/Makefile.in.orig 2004-11-13 19:25:55 +0100
++++ src/plugins/printable/Makefile.in 2004-11-16 10:51:42 +0100
@@ -444,7 +444,7 @@
done
dictionary-builder$(EXEEXT): $(dictionary_builder_OBJECTS)
$(dictionary_builder_DEPENDENCIES)
@@ -21,15 +41,3 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig 2004-10-18 01:22:15 +0200
-+++ src/plugins/ole2/Makefile.in 2004-10-18 09:42:24 +0200
-@@ -226,7 +226,7 @@
-
- AM_CFLAGS = $(GLIB_CFLAGS)
- libextractor_ole2_la_LIBADD = \
-- $(GLIB_LIBS) @EXT_LIB_PATH@ $(LIBADD) @EXT_LIBS@ -lgobject-2.0 \
-+ $(GLIB_LIBS) @EXT_LIB_PATH@ $(LIBADD) @EXT_LIBS@ -lgobject2 \
- $(top_builddir)/src/main/libextractor.la
-
- libextractor_ole2_la_LDFLAGS = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 24 Oct 2004 16:04:38
-0000 1.11
+++ openpkg-src/libextractor/libextractor.spec 16 Nov 2004 09:57:50
-0000 1.12
@@ -33,8 +33,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.3.10
-Release: 20041024
+Version: 0.3.11
+Release: 20041116
# list of sources
Source0:
http://ovmj.org/libextractor/download/libextractor-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
