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: 14-Aug-2005 09:41:03
Branch: HEAD Handle: 2005081408410300
Modified files:
openpkg-src/libextractor
libextractor.patch libextractor.spec
Log:
upgrading package: libextractor 0.5.2 -> 0.5.3
Summary:
Revision Changes Path
1.7 +34 -25 openpkg-src/libextractor/libextractor.patch
1.17 +11 -13 openpkg-src/libextractor/libextractor.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 libextractor.patch
--- openpkg-src/libextractor/libextractor.patch 2 Aug 2005 17:44:16
-0000 1.6
+++ openpkg-src/libextractor/libextractor.patch 14 Aug 2005 07:41:03
-0000 1.7
@@ -1,35 +1,44 @@
Index: src/main/Makefile.in
---- 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)
+--- src/main/Makefile.in.orig 2005-08-14 03:41:20 +0200
++++ src/main/Makefile.in 2005-08-14 09:10:39 +0200
+@@ -69,6 +69,7 @@
+ getopt1.$(OBJEXT)
extract_OBJECTS = $(am_extract_OBJECTS)
extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
+extract_LDFLAGS = -static
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
+ am_test_binary_OBJECTS = test_binary.$(OBJEXT)
+ test_binary_OBJECTS = $(am_test_binary_OBJECTS)
+ test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
+@@ -264,7 +265,7 @@
+ -export-dynamic -version-info 2:0:1 $(LIBICONV)
+
+ libextractor_la_LIBADD = \
+- $(LIBLTDL) $(dlflag)
++ $(LIBLTDL)
+
+ libextractor_la_DEPENDENCIES = \
+ $(LIBLTDL)
Index: src/plugins/ole2/Makefile.in
---- src/plugins/ole2/Makefile.in.orig 2004-12-25 19:34:49 +0100
-+++ src/plugins/ole2/Makefile.in 2004-12-26 09:11:02 +0100
-@@ -241,7 +241,7 @@
+--- src/plugins/ole2/Makefile.in.orig 2005-08-14 03:50:09 +0200
++++ src/plugins/ole2/Makefile.in 2005-08-14 09:11:23 +0200
+@@ -243,7 +243,7 @@
+ $(GLIB_CFLAGS)
- # 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
+ libextractor_ole2_la_LIBADD = \
+- $(LIBADD) $(GLIB_LIBS) -lgobject-2.0 \
++ $(LIBADD) $(GLIB_LIBS) -lgobject2 \
+ $(top_builddir)/src/main/libextractor.la
- # Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
+ libextractor_ole2_la_LDFLAGS = \
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
+--- src/plugins/thumbnail/Makefile.in.orig 2005-08-14 03:50:23 +0200
++++ src/plugins/thumbnail/Makefile.in 2005-08-14 09:11:43 +0200
+@@ -238,7 +238,7 @@
+ $(GLIB_CFLAGS)
libextractor_thumbnail_la_LIBADD = \
+- $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
++ $(LIBADD) -lgobject2 @GTK_LIBS@ \
+ $(top_builddir)/src/main/libextractor.la
+
+ libextractor_thumbnail_la_LDFLAGS = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libextractor/libextractor.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 libextractor.spec
--- openpkg-src/libextractor/libextractor.spec 2 Aug 2005 17:44:16
-0000 1.16
+++ openpkg-src/libextractor/libextractor.spec 14 Aug 2005 07:41:03
-0000 1.17
@@ -25,25 +25,25 @@
# package information
Name: libextractor
Summary: File Extraction and Classification Library
-URL: http://ovmj.org/libextractor/
+URL: http://gnunet.org/libextractor/
Vendor: Christian Grothoff & Vids Samanta
Packager: OpenPKG
Distribution: OpenPKG
Class: EVAL
Group: Filesystem
License: GPL
-Version: 0.5.2
-Release: 20050802
+Version: 0.5.3
+Release: 20050814
# list of sources
-Source0:
http://ovmj.org/libextractor/download/libextractor-%{version}.tar.gz
+Source0:
http://gnunet.org/libextractor/download/libextractor-%{version}.tar.gz
Patch0: libextractor.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv, libtool, gcc
-PreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv, libtool
+BuildPreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv, gcc
+PreReq: OpenPKG, openpkg >= 20040130, gettext, libiconv
AutoReq: no
AutoReqProv: no
@@ -67,9 +67,6 @@
%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
@@ -92,10 +89,11 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- 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
+ 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
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libextractor/libextractor.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
