[packages/libextractor] - updated to 0.6.2 - added support for rpm 5 - removed obsolete patches - removed -printable subpack

baggins baggins at pld-linux.org
Mon Sep 10 19:18:35 CEST 2012 

commit a78ce0f6777ae32778a34f3e4ab975ff3e7fe06a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 10 19:16:29 2012 +0200

    - updated to 0.6.2
    - added support for rpm 5
    - removed obsolete patches
    - removed -printable subpackage (removed upstream)

 libextractor-make.patch  |  11 -----
 libextractor-pmake.patch |  65 +++------------------------
 libextractor-rpm.patch   |  10 -----
 libextractor-rpm5.patch  | 112 +++++++++++++++++++++++++++++++++++++++++++++++
 libextractor.spec        |  61 ++++++--------------------
 5 files changed, 130 insertions(+), 129 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index ad41df3..6ed581c 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -6,17 +6,16 @@
 Summary:	Meta-data extraction library
 Summary(pl.UTF-8):	Biblioteka do ekstrakcji metadanych
 Name:		libextractor
-Version:	0.5.22
-Release:	2
+Version:	0.6.2
+Release:	0.1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://gnunet.org/libextractor/download/%{name}-%{version}.tar.gz
-# Source0-md5:	f6d6ea1264a471189eee99728b983c4e
+Source0:	ftp://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
+# Source0-md5:	4b2af1167061430d58a101d5dfc6b4c7
 Patch0:		%{name}-64bit.patch
-Patch1:		%{name}-make.patch
+Patch1:		%{name}-pmake.patch
 Patch2:		%{name}-info.patch
-Patch3:		%{name}-pmake.patch
-Patch4:		%{name}-rpm.patch
+Patch5:		%{name}-rpm5.patch
 URL:		http://gnunet.org/libextractor/
 %if %{with qt}
 BuildRequires:	QtSvg-devel >= 4.0.1
@@ -38,6 +37,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	rpm-devel
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
+Obsoletes:	libextractor-printable
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqfiles		%{_libdir}/%{name}/libextractor_.*\\.la
@@ -84,18 +84,6 @@ używane w podobny sposób, co "file". "file" zna więcej typów danych,
 informacji na temat obsługiwanych formatów (HTML, JPEG, Ogg, MP3, PNG,
 GIF, RPM, RA, RM, PS, PDF, ZIP, QT, ASF).
 
-%package printable
-Summary:	Printable text support plugins for libextractor
-Summary(pl.UTF-8):	Wtyczki obsługujące tekst dla biblioteki libextractor
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description printable
-libextractor plugins that support printable text in few languages.
-
-%description printable -l pl.UTF-8
-Wtyczki biblioteki libextractor obsługujące tekst w kilku językach.
-
 %package thumbnail
 Summary:	GTK+ Thumbnail plugin for libextractor
 Summary(pl.UTF-8):	Wtyczka obsługująca miniaturki obrazów poprzez GTK+ dla biblioteki libextractor
@@ -157,8 +145,7 @@ Statyczna wersja bibliotek libextractor.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch5 -p1
 
 %build
 %{__gettextize}
@@ -203,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/extract
 %attr(755,root,root) %{_libdir}/libextractor.so.*.*.*
 %attr(755,root,root) %{_libdir}/libextractor_common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libextractor.so.1
+%attr(755,root,root) %ghost %{_libdir}/libextractor.so.3
 %attr(755,root,root) %ghost %{_libdir}/libextractor_common.so.0
 # plugins are lt_dlopened without extension, so *.la are needed
 %dir %{_libdir}/%{name}
@@ -212,31 +199,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_deb.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_dvi.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_elf.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_exiv2.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_filename.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_flac.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_flv.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_gif.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_hash_md5.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_hash_rmd160.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_hash_sha1.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_html.so
+%attr(755,root,root) %{_libdir}/%{name}/libextractor_id3.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_id3v2.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_id3v23.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_id3v24.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_it.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_jpeg.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_lower.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_man.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_mime.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_mp3.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_mpeg.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_nsf.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_nsfe.so
+%attr(755,root,root) %{_libdir}/%{name}/libextractor_odf.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_ogg.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_ole2.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_oo.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_pdf.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_png.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_ps.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_qt.so
@@ -245,10 +226,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_rpm.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_s3m.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_sid.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_split.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_tar.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_tiff.so
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_translit.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_wav.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_xm.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_zip.so
@@ -257,31 +236,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libextractor_deb.la
 %{_libdir}/%{name}/libextractor_dvi.la
 %{_libdir}/%{name}/libextractor_elf.la
-%{_libdir}/%{name}/libextractor_exiv2.la
-%{_libdir}/%{name}/libextractor_filename.la
 %{_libdir}/%{name}/libextractor_flac.la
 %{_libdir}/%{name}/libextractor_flv.la
 %{_libdir}/%{name}/libextractor_gif.la
-%{_libdir}/%{name}/libextractor_hash_md5.la
-%{_libdir}/%{name}/libextractor_hash_rmd160.la
-%{_libdir}/%{name}/libextractor_hash_sha1.la
 %{_libdir}/%{name}/libextractor_html.la
+%{_libdir}/%{name}/libextractor_id3.la
 %{_libdir}/%{name}/libextractor_id3v2.la
 %{_libdir}/%{name}/libextractor_id3v23.la
 %{_libdir}/%{name}/libextractor_id3v24.la
 %{_libdir}/%{name}/libextractor_it.la
 %{_libdir}/%{name}/libextractor_jpeg.la
-%{_libdir}/%{name}/libextractor_lower.la
 %{_libdir}/%{name}/libextractor_man.la
 %{_libdir}/%{name}/libextractor_mime.la
 %{_libdir}/%{name}/libextractor_mp3.la
 %{_libdir}/%{name}/libextractor_mpeg.la
 %{_libdir}/%{name}/libextractor_nsf.la
 %{_libdir}/%{name}/libextractor_nsfe.la
+%{_libdir}/%{name}/libextractor_odf.la
 %{_libdir}/%{name}/libextractor_ogg.la
 %{_libdir}/%{name}/libextractor_ole2.la
-%{_libdir}/%{name}/libextractor_oo.la
-%{_libdir}/%{name}/libextractor_pdf.la
 %{_libdir}/%{name}/libextractor_png.la
 %{_libdir}/%{name}/libextractor_ps.la
 %{_libdir}/%{name}/libextractor_qt.la
@@ -290,23 +263,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libextractor_rpm.la
 %{_libdir}/%{name}/libextractor_s3m.la
 %{_libdir}/%{name}/libextractor_sid.la
-%{_libdir}/%{name}/libextractor_split.la
 %{_libdir}/%{name}/libextractor_tar.la
 %{_libdir}/%{name}/libextractor_tiff.la
-%{_libdir}/%{name}/libextractor_translit.la
 %{_libdir}/%{name}/libextractor_wav.la
 %{_libdir}/%{name}/libextractor_xm.la
 %{_libdir}/%{name}/libextractor_zip.la
 %{_mandir}/man1/extract.1*
 
-%files printable
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_printable_*.so
-%{_libdir}/%{name}/libextractor_printable_*.la
-
 %files thumbnail
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/libextractor_thumbnail.so
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_thumbnailgtk.so
 %{_libdir}/%{name}/libextractor_thumbnailgtk.la
 
diff --git a/libextractor-make.patch b/libextractor-make.patch
deleted file mode 100644
index afe0440..0000000
--- a/libextractor-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libextractor-0.5.19/src/plugins/Makefile.am.orig	2007-12-31 14:17:46.000000000 +0100
-+++ libextractor-0.5.19/src/plugins/Makefile.am	2008-01-22 21:45:54.695968011 +0100
-@@ -373,7 +373,7 @@
-   $(QT_CFLAGS) $(QT_SVG_CFLAGS)
- 
- install-exec-hook:
--	mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
-+	mkdir -p $(DESTDIR)$(plugindir) 2> /dev/null || true
- 	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
- 	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la
- 	if test "$(thumbgtk)" != ""; then \
diff --git a/libextractor-pmake.patch b/libextractor-pmake.patch
index 4366a94..aadd4e0 100644
--- a/libextractor-pmake.patch
+++ b/libextractor-pmake.patch
@@ -10,66 +10,11 @@
  if !MINGW
  if !SOMEBSD
 @@ -70,7 +70,7 @@
- test_binary_SOURCES = \
-   test_binary.c
- test_binary_LDADD = \
--  $(top_builddir)/src/main/libextractor.la
-+  libextractor.la
  
  
+ LDADD = \
+- $(top_builddir)/src/main/libextractor.la  
++ libextractor.la
  
---- libextractor-0.5.20/src/plugins/printable/Makefile.am.orig	2007-06-14 00:30:05.000000000 +0200
-+++ libextractor-0.5.20/src/plugins/printable/Makefile.am	2008-03-22 17:46:23.958517722 +0100
-@@ -16,29 +16,41 @@
- 
- CLEANFILES = da.c de.c en.c es.c fi.c fr.c ga.c it.c no.c pt.c sv.c peda.c pede.c peen.c pees.c pefi.c pefr.c pega.c peit.c peno.c pept.c pesv.c $(da_LANG) $(de_LANG) $(es_LANG) $(en_LANG) $(fi_LANG) $(fr_LANG) $(ga_LANG) $(it_LANG) $(no_LANG) $(pt_LANG) $(sv_LANG)
- 
--da.c $(da_LANG): dictionary-builder$(EXEEXT)
-+da.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/da da > da.c
--de.c $(de_LANG): dictionary-builder$(EXEEXT)
-+de.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/de de > de.c
--en.c $(en_LANG): dictionary-builder$(EXEEXT)
-+en.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/en en > en.c
--es.c $(es_LANG): dictionary-builder$(EXEEXT)
-+es.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/es es > es.c
--fi.c $(fi_LANG): dictionary-builder$(EXEEXT)
-+fi.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/fi fi > fi.c
--fr.c $(fr_LANG): dictionary-builder$(EXEEXT)
-+fr.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/fr fr > fr.c
--ga.c $(ga_LANG): dictionary-builder$(EXEEXT)
-+ga.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/ga ga > ga.c
--it.c $(it_LANG): dictionary-builder$(EXEEXT)
-+it.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/it it > it.c
--no.c $(no_LANG): dictionary-builder$(EXEEXT)
-+no.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/no no > no.c
--pt.c $(pt_LANG): dictionary-builder$(EXEEXT)
-+pt.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/pt pt > pt.c
--sv.c $(sv_LANG): dictionary-builder$(EXEEXT)
-+sv.c: dictionary-builder$(EXEEXT)
- 	./dictionary-builder $(srcdir)/sv sv > sv.c
- 
-+$(da_LANG): da.c
-+$(de_LANG): de.c
-+$(en_LANG): en.c
-+$(es_LANG): es.c
-+$(fi_LANG): fi.c
-+$(fr_LANG): fr.c
-+$(ga_LANG): ga.c
-+$(it_LANG): it.c
-+$(no_LANG): no.c
-+$(pt_LANG): pt.c
-+$(sv_LANG): sv.c
-+
- peda.c:
- 	cat peXX.c | sed -e "s/XX/da/" > peda.c
- pede.c:
+ if HAVE_ZZUF
+   fuzz_tests=fuzz_default.sh fuzz_thumbnail.sh
diff --git a/libextractor-rpm.patch b/libextractor-rpm.patch
deleted file mode 100644
index c8ae8bb..0000000
--- a/libextractor-rpm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libextractor-0.5.21/src/plugins/rpm/rpmextractor.c.orig	2008-07-22 11:11:52.000000000 +0200
-+++ libextractor-0.5.21/src/plugins/rpm/rpmextractor.c	2008-11-19 18:32:43.426468647 +0100
-@@ -91,7 +91,6 @@
-   {RPMTAG_SUMMARY, EXTRACTOR_SUMMARY},
-   {RPMTAG_PACKAGER, EXTRACTOR_PACKAGER},
-   {RPMTAG_BUILDTIME, EXTRACTOR_CREATION_DATE},
--  {RPMTAG_COPYRIGHT, EXTRACTOR_COPYRIGHT},
-   {RPMTAG_LICENSE, EXTRACTOR_LICENSE},
-   {RPMTAG_DISTRIBUTION, EXTRACTOR_DISTRIBUTION},
-   {RPMTAG_BUILDHOST, EXTRACTOR_BUILDHOST},
diff --git a/libextractor-rpm5.patch b/libextractor-rpm5.patch
new file mode 100644
index 0000000..e502824
--- /dev/null
+++ b/libextractor-rpm5.patch
@@ -0,0 +1,112 @@
+diff --git a/configure.ac b/configure.ac
+index 192a838..4ddd127 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,12 +200,11 @@ AC_CHECK_LIB(bz2, BZ2_decompress,
+          AM_CONDITIONAL(HAVE_BZ2, false))],
+          AM_CONDITIONAL(HAVE_BZ2, false))
+ 
+-AC_CHECK_LIB(rpm, rpmReadPackageFile,
+-        [AC_CHECK_HEADERS([rpm/rpmlib.h],
+-          AM_CONDITIONAL(HAVE_LIBRPM, true)
+-          AC_DEFINE(HAVE_LIBRPM,1,[Have librpm]),
+-         AM_CONDITIONAL(HAVE_LIBRPM, false))],
+-         AM_CONDITIONAL(HAVE_LIBRPM, false))
++PKG_CHECK_MODULES(RPM, rpm,
++		  AM_CONDITIONAL(HAVE_LIBRPM, true)
++		  AC_DEFINE([HAVE_LIBRPM],[1], "RPM..."),
++		  AM_CONDITIONAL(HAVE_LIBRPM, false)
++		  )
+ 
+ AC_CHECK_LIB(mpeg2, mpeg2_init,
+         [AC_CHECK_HEADERS([mpeg2dec/mpeg2.h],
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index b3dd1de..7201699 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
++INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common $(RPM_CFLAGS)
+ 
+ # install plugins under:
+ plugindir = $(libdir)/@RPLUGINDIR@
+diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c
+index f8ed431..157af07 100644
+--- a/src/plugins/rpm_extractor.c
++++ b/src/plugins/rpm_extractor.c
+@@ -21,9 +21,12 @@
+ #include "platform.h"
+ #include "extractor.h"
+ #include <stdint.h>
+-#include <rpm/rpmlib.h>
+-#include <rpm/rpmts.h>
+-#include <rpm/rpmlog.h>
++#include <rpmcli.h>
++#include <rpmcli.h>
++#include <rpmio.h>
++#include <rpmtag.h>
++#include <rpmts.h>
++#include <rpmlog.h>
+ #include <pthread.h>
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -170,7 +173,7 @@ EXTRACTOR_rpm_extract (const char *data,
+   const char *str;
+   Header hdr;
+   HeaderIterator hi;
+-  rpmtd p;
++  HE_t p;
+   int i;
+   FD_t fdi;
+   rpmRC rc;
+@@ -218,33 +221,42 @@ EXTRACTOR_rpm_extract (const char *data,
+ 		 "application/x-rpm",
+ 		 strlen ("application/x-rpm") +1))
+     return 1;
+-  hi = headerInitIterator (hdr);
+-  p = rpmtdNew ();
+-  while (1 == headerNext (hi, p))
++  hi = headerInit(hdr);
++  p = (HE_t)memset(alloca(sizeof(*p)), 0, sizeof(*p));
++  while (1 == headerNext (hi, p, 0))
+     {
+       i = 0;
+       while (tests[i].rtype != 0)
+         {
+           if (tests[i].rtype == p->tag)
+             {
+-              switch (p->type)
++              switch (p->t)
+                 {
+                 case RPM_STRING_ARRAY_TYPE:
++		    if (0 != proc (proc_cls, 
++                                "rpm",
++                                tests[i].type,
++                                EXTRACTOR_METAFORMAT_UTF8,
++                                "text/plain",
++                                p->p.str,
++                                strlen (p->p.str) +1))
++			  return 1;
++	      	     break;
+                 case RPM_I18NSTRING_TYPE:
+                 case RPM_STRING_TYPE:
+-                    while (NULL != (str = rpmtdNextString (p))) 
++		    for(p->ix = 0; p->ix < p->c; p->ix++)
+ 		      {
+ 			if (0 != proc (proc_cls, 
+ 				       "rpm",
+ 				       tests[i].type,
+ 				       EXTRACTOR_METAFORMAT_UTF8,
+ 				       "text/plain",
+-				       str,
+-				       strlen (str) +1))
++				       p->p.argv[p->ix],
++				       strlen (p->p.argv[p->ix]) +1))
+ 			  return 1;
+ 		      }
+                     break;
+-                case RPM_INT32_TYPE:
++                case RPM_UINT32_TYPE:
+                   {
+                     if (p->tag == RPMTAG_BUILDTIME)
+                       {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libextractor.git/commitdiff/a01a12cb9f0f1426238e5e516f722814a8d7c86a

More information about the pld-cvs-commit mailing list