rpms/libextractor/EL-5 .cvsignore, 1.4, 1.5 libextractor.spec, 1.5, 1.6 sources, 1.5, 1.6

Jeff Sheltren sheltren at fedoraproject.org
Sat May 30 00:28:45 UTC 2009 

Author: sheltren

Update of /cvs/extras/rpms/libextractor/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3666

Modified Files:
	.cvsignore libextractor.spec sources 
Log Message:
First build for EPEL - bump to 0.5.22



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libextractor/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Aug 2007 15:03:03 -0000	1.4
+++ .cvsignore	30 May 2009 00:28:14 -0000	1.5
@@ -1,2 +1 @@
-libextractor*.tar.gz
-libextractor*.tar.gz.sig
+libextractor-0.5.22.tar.gz


Index: libextractor.spec
===================================================================
RCS file: /cvs/extras/rpms/libextractor/EL-5/libextractor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libextractor.spec	25 Aug 2007 15:03:03 -0000	1.5
+++ libextractor.spec	30 May 2009 00:28:15 -0000	1.6
@@ -1,26 +1,28 @@
 %bcond_with	mpeg
+%bcond_with	flac
+%bcond_with	qt
 
 %global plugindir	%_libdir/%name
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		libextractor
-Version:	0.5.18a
-Release:	%release_func 1
+Version:	0.5.22
+Release:	%release_func 2
 Summary:	Simple library for keyword extraction
 
 Group:		System Environment/Libraries
-License:	GPL
+License:	GPLv2+
 URL:		http://gnunet.org/libextractor/
 Source0:	http://gnunet.org/libextractor/download/%name-%version.tar.gz
-Source1:	http://gnunet.org/libextractor/download/%name-%version.tar.gz.sig
+#Source1:	http://gnunet.org/libextractor/download/%name-%version.tar.gz.sig
 Source10:	README.fedora
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	gettext
 BuildRequires:	libtool-ltdl-devel libvorbis-devel
 BuildRequires:	bzip2-devel zlib-devel
-BuildRequires:	gtk2-devel libgsf-devel qt4-devel
+BuildRequires:	gtk2-devel libgsf-devel
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
@@ -40,8 +42,10 @@ Requires:	%name-plugins-exiv2
 Requires:	%name-plugins-ogg
 Requires:	%name-plugins-ole2
 Requires:	%name-plugins-pdf
+%{?with_flac:Requires:	%name-plugins-flac}
 Requires:	%name-plugins-thumbnailgtk
-Requires:	%name-plugins-thumbnailqt
+%{?with_qt:Requires:   %name-plugins-thumbnailqt}
+#Requires:	%name-plugins-rpm
 
 
 %global pluginpkg(B:R:P:u)	\
@@ -73,16 +77,20 @@ Group:		System Environment/Libraries
 Requires:	%name = %version-%release
 
 %{?with_mpeg:%pluginpkg mpeg -B mpeg2dec-devel}
+%{?with_flac:%pluginpkg flac -B flac-devel}
 %pluginpkg exiv2
 %pluginpkg ogg
 %pluginpkg ole2
 %pluginpkg pdf
+#pluginpkg rpm -B rpm-devel
 
 %pluginpkg thumbnailgtk -u -P plugin(%name)=thumbnail
 %ghost %plugindir/libextractor-thumbnail.so
 
-%pluginpkg thumbnailqt  -u -P plugin(%name)=thumbnail
+%{?with_qt:
+%pluginpkg thumbnailqt  -u -P plugin(%name)=thumbnail -B qt4-devel
 %ghost %plugindir/libextractor-thumbnail.so
+}
 
 
 %description
@@ -126,13 +134,23 @@ developing applications that use %name.
 install -pm644 %SOURCE10 .
 rm -f README.debian
 
+sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-I/usr/include\) !!g' configure
 
 %build
 %{!?with_mpeg:export ac_cv_lib_mpeg2_mpeg2_init=no}
+export ac_cv_lib_rpm_rpmReadPackageFile=no
+
 %configure --disable-static	\
-	--enable-xpdf		\
+	--disable-rpath		\
+	--disable-xpdf		\
 	--with-qt=/usr
 
+# build with --as-needed and disable rpath
+sed -i \
+	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
+	libtool
+
 # not SMP safe
 make # %{?_smp_mflags}
 	
@@ -156,7 +174,8 @@ for i in $RPM_BUILD_ROOT%plugindir/*.so;
 			lib=${lib%%.so*}
 			case $lib in
 				(libz|libdl)				;;
-				(libextractor|libc|libm|libpthread)	;;
+				(libextractor|libextractor_common)	;;
+				(libc|libm|libpthread)	;;
 				(*)
 					target=other
 					echo "$fname -> $lib"
@@ -176,7 +195,6 @@ rm -f $RPM_BUILD_ROOT%_infodir/dir
 mv $RPM_BUILD_ROOT%_bindir/{,libextractor-}extract
 mv $RPM_BUILD_ROOT%_mandir/man1/{,libextractor-}extract.1
 
-
 %find_lang libextractor
 
 
@@ -202,6 +220,7 @@ test $1 != 0 || /sbin/install-info --inf
 test "$1" != 0 || \
 	/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailgtk.so
 
+%{?with_qt:
 %post  plugins-thumbnailqt
 /usr/sbin/update-alternatives --install \
 	%plugindir/libextractor_thumbnail.so   libextractor_thumbnail %plugindir/libextractor_thumbnailqt.so  20
@@ -209,6 +228,7 @@ test "$1" != 0 || \
 %preun plugins-thumbnailqt
 test "$1" != 0 || \
 	/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailqt.so
+}
 
 
 %files -f libextractor.lang
@@ -233,6 +253,35 @@ test "$1" != 0 || \
 
 
 %changelog
+* Thu May 28 2009 Jeff Sheltren <jeff at osuosl.org> - 0.5.22-2
+- Rebuild for EL5
+- disable flac and qt packages by default
+
+* Sat Mar  7 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.22-1
+- updated to 0.5.22
+- disabled rpm plugin for now as it does not build with rpm-4.6
+- disabled builtin xpdf plugin
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.20b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Nov 26 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.21-1
+- updated to 0.5.21
+- added -rpm plugin
+
+* Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.20b-2
+- fix license tag
+
+* Sat Jun 21 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.20b-1
+- updated to 0.5.20b (SECURITY); fixes CVE-2008-1693 (xpdf embedded
+  font vulnerability)
+- build with -Wl,-as-needed
+- fixed rpath issues
+
+* Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.19a-1
+- updated to 0.5.19a
+- added flac-plugin subpackage
+
 * Sat Aug 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.18a-1
 - updated to 0.5.18a
 - renamed 'extract' program to 'libextractor-extract'


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libextractor/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2007 15:03:03 -0000	1.5
+++ sources	30 May 2009 00:28:15 -0000	1.6
@@ -1,2 +1 @@
-1623ee0670c2da8ce12d68a7c98dc1e0  libextractor-0.5.18a.tar.gz
-b6815c37d3dea4c1bd100f6423810688  libextractor-0.5.18a.tar.gz.sig
+f6d6ea1264a471189eee99728b983c4e  libextractor-0.5.22.tar.gz

More information about the scm-commits mailing list