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: 16-May-2006 09:45:26
Branch: HEAD Handle: 2006051608452600
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
requires GNU make
Summary:
Revision Changes Path
1.10 +32 -86 openpkg-src/libextractor/libextractor.patch
1.25 +6 -4 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 4 May 2006 08:27:01
-0000 1.9
+++ openpkg-src/libextractor/libextractor.patch 16 May 2006 07:45:26
-0000 1.10
@@ -1,6 +1,6 @@
Index: src/main/Makefile.in
---- src/main/Makefile.in.orig 2006-03-11 03:01:59 +0100
-+++ src/main/Makefile.in 2006-05-04 10:07:10 +0200
+--- src/main/Makefile.in.orig 2006-04-22 20:33:16 +0200
++++ src/main/Makefile.in 2006-05-07 08:34:20 +0200
@@ -69,6 +69,7 @@
getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
@@ -9,7 +9,7 @@
am_test_binary_OBJECTS = test_binary.$(OBJEXT)
test_binary_OBJECTS = $(am_test_binary_OBJECTS)
test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
-@@ -270,7 +271,7 @@
+@@ -272,7 +273,7 @@
-export-dynamic -version-info 2:0:1 $(LIBICONV)
libextractor_la_LIBADD = \
@@ -19,9 +19,9 @@
libextractor_la_DEPENDENCIES = \
$(LIBLTDL)
Index: src/plugins/Makefile.in
---- src/plugins/Makefile.in.orig 2006-03-11 08:22:45 +0100
-+++ src/plugins/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -319,12 +319,12 @@
+--- src/plugins/Makefile.in.orig 2006-04-22 20:33:17 +0200
++++ src/plugins/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -326,12 +326,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -37,9 +37,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/exiv2/Makefile.in
---- src/plugins/exiv2/Makefile.in.orig 2006-03-11 03:02:00 +0100
-+++ src/plugins/exiv2/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -175,12 +175,12 @@
+--- src/plugins/exiv2/Makefile.in.orig 2006-04-22 20:33:18 +0200
++++ src/plugins/exiv2/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -177,12 +177,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -55,9 +55,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/hash/Makefile.in
---- src/plugins/hash/Makefile.in.orig 2006-03-11 03:02:00 +0100
-+++ src/plugins/hash/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -164,12 +164,12 @@
+--- src/plugins/hash/Makefile.in.orig 2006-04-22 20:33:18 +0200
++++ src/plugins/hash/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -166,12 +166,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -73,9 +73,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig 2006-03-11 03:02:01 +0100
-+++ src/plugins/ole2/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -145,12 +145,12 @@
+--- src/plugins/ole2/Makefile.in.orig 2006-04-22 20:33:19 +0200
++++ src/plugins/ole2/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -147,12 +147,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -90,7 +90,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-@@ -245,7 +245,7 @@
+@@ -247,7 +247,7 @@
$(GLIB_CFLAGS)
libextractor_ole2_la_LIBADD = \
@@ -100,9 +100,9 @@
libextractor_ole2_la_LDFLAGS = \
Index: src/plugins/oo/Makefile.in
---- src/plugins/oo/Makefile.in.orig 2006-03-11 03:02:01 +0100
-+++ src/plugins/oo/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -150,12 +150,12 @@
+--- src/plugins/oo/Makefile.in.orig 2006-04-22 20:33:19 +0200
++++ src/plugins/oo/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -152,12 +152,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -118,9 +118,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/pdf/Makefile.in
---- src/plugins/pdf/Makefile.in.orig 2006-03-11 03:02:01 +0100
-+++ src/plugins/pdf/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -171,12 +171,12 @@
+--- src/plugins/pdf/Makefile.in.orig 2006-04-22 20:33:20 +0200
++++ src/plugins/pdf/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -173,12 +173,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -136,9 +136,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/printable/Makefile.in
---- src/plugins/printable/Makefile.in.orig 2006-03-11 03:02:02 +0100
-+++ src/plugins/printable/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -202,12 +202,12 @@
+--- src/plugins/printable/Makefile.in.orig 2006-04-22 20:33:21 +0200
++++ src/plugins/printable/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -478,12 +478,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -154,9 +154,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/rpm/Makefile.in
---- src/plugins/rpm/Makefile.in.orig 2006-03-11 03:02:02 +0100
-+++ src/plugins/rpm/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -149,12 +149,12 @@
+--- src/plugins/rpm/Makefile.in.orig 2006-04-22 20:33:21 +0200
++++ src/plugins/rpm/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -151,12 +151,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -172,9 +172,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
Index: src/plugins/thumbnail/Makefile.in
---- src/plugins/thumbnail/Makefile.in.orig 2006-03-11 03:02:02 +0100
-+++ src/plugins/thumbnail/Makefile.in 2006-05-04 10:07:10 +0200
-@@ -145,12 +145,12 @@
+--- src/plugins/thumbnail/Makefile.in.orig 2006-04-22 20:33:22 +0200
++++ src/plugins/thumbnail/Makefile.in 2006-05-07 08:34:20 +0200
+@@ -147,12 +147,12 @@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
@@ -189,7 +189,7 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-@@ -245,7 +245,7 @@
+@@ -247,7 +247,7 @@
$(GLIB_CFLAGS) $(GTK_CFLAGS)
libextractor_thumbnail_la_LIBADD = \
@@ -198,57 +198,3 @@
$(top_builddir)/src/main/libextractor.la
libextractor_thumbnail_la_LDFLAGS = \
-Index: src/plugins/wordleaker/Makefile.in
---- src/plugins/wordleaker/Makefile.in.orig 2006-03-11 03:02:02 +0100
-+++ src/plugins/wordleaker/Makefile.in 2006-05-04 10:20:49 +0200
-@@ -14,6 +14,11 @@
-
- @SET_MAKE@
-
-+GLIB_CFLAGS = @GLIB_CFLAGS@
-+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-+GLIB_LIBS = @GLIB_LIBS@
-+GLIB_MKENUMS = @GLIB_MKENUMS@
-+
- SOURCES = $(libextractor_word_la_SOURCES)
-
- srcdir = @srcdir@
-@@ -66,15 +71,15 @@
- am__depfiles_maybe = depfiles
- @[EMAIL PROTECTED] = ./$(DEPDIR)/pole.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/wordextractor.Plo
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+CXXCOMPILE = $(CXX) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(GLIB_CFLAGS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+COMPILE = $(CC) $(GLIB_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-Index: src/plugins/wordleaker/wordextractor.cc
---- src/plugins/wordleaker/wordextractor.cc.orig 2006-03-11 01:10:50
+0100
-+++ src/plugins/wordleaker/wordextractor.cc 2006-05-04 10:15:28 +0200
-@@ -30,6 +30,7 @@
-
- #include "wordleaker.h"
- #include "pole.h"
-+#include "glib/gstrfuncs.h"
-
-
- extern "C" {
-@@ -84,7 +85,7 @@
- &t))
- return NULL;
-
-- return strndup(f, 128);
-+ return g_strndup(f, 128);
- }
-
- static const char * idToProduct( unsigned int id ) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 4 May 2006 08:27:01
-0000 1.24
+++ openpkg-src/libextractor/libextractor.spec 16 May 2006 07:45:26
-0000 1.25
@@ -32,8 +32,8 @@
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.5.11
-Release: 20060504
+Version: 0.5.12
+Release: 20060516
# list of sources
Source0:
http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
@@ -42,8 +42,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv, gcc
-PreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: gettext, libiconv
+PreReq: gettext, libiconv
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
