rpms/libextractor/devel .cvsignore, 1.7, 1.8 lastver, 1.5, 1.6 libextractor.spec, 1.18, 1.19 sources, 1.9, 1.10 verinfo, 1.1, 1.2 plugindir.patch, 1.1, NONE

ensc ensc at fedoraproject.org
Sat Jan 16 16:23:11 UTC 2010 

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16169

Modified Files:
	.cvsignore lastver libextractor.spec sources verinfo 
Removed Files:
	plugindir.patch 
Log Message:
- updated to 0.6.0
- removed -pluginpath patch; upstream changed plugin loading mechanism
  which fixed the problem solved by the patch
- removed 'update-alternatives' registration of thumbnail* plugins; it
  conflicts with new loading mechanism



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2009 18:13:24 -0000	1.7
+++ .cvsignore	16 Jan 2010 16:23:08 -0000	1.8
@@ -1 +1,2 @@
-libextractor-0.5.23.tar.gz
+libextractor-0.6.0.tar.gz
+libextractor-0.6.0.tar.gz.sig


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lastver	12 Sep 2009 18:13:25 -0000	1.5
+++ lastver	16 Jan 2010 16:23:09 -0000	1.6
@@ -1 +1 @@
-0.5.23
+0.6.0


Index: libextractor.spec
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libextractor.spec	4 Jan 2010 20:36:40 -0000	1.18
+++ libextractor.spec	16 Jan 2010 16:23:09 -0000	1.19
@@ -10,21 +10,20 @@
 %nil}
 
 Name:		libextractor
-Version:	0.5.23
-Release:	%release_func 1304
+Version:	0.6.0
+Release:	%release_func 1300
 Summary:	Simple library for keyword extraction
 
 Group:		System Environment/Libraries
 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
+Source0:	http://ftp.gnu.org/gnu/libextractor/%name-%version.tar.gz
+Source1:	http://ftp.gnu.org/gnu/libextractor/%name-%version.tar.gz.sig
 Source10:	README.fedora
-Patch0:		plugindir.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	gettext
-BuildRequires:	libtool-ltdl-devel libvorbis-devel
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	bzip2-devel zlib-devel
 BuildRequires:	gtk2-devel libgsf-devel qt4-devel
 Requires(post):		/sbin/install-info
@@ -84,16 +83,12 @@ Requires:	%name = %version-%release
 %{?with_mpeg:%pluginpkg mpeg -B mpeg2dec-devel}
 %{?with_flac:%pluginpkg flac -B flac-devel}
 %pluginpkg exiv2 -B exiv2-devel
-%pluginpkg ogg
+%pluginpkg ogg -B libvorbis-devel
 %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
-%ghost %plugindir/libextractor-thumbnail.so
+%pluginpkg thumbnailgtk
+%pluginpkg thumbnailqt
 
 
 %description
@@ -133,7 +128,6 @@ developing applications that use %name.
 
 %prep
 %setup -q
-%apply -n0 -p1
 
 install -pm644 %SOURCE10 .
 rm -f README.debian
@@ -178,6 +172,7 @@ for i in $RPM_BUILD_ROOT%plugindir/*.so;
 		while read lib; do
 			lib=${lib%%.so*}
 			case $lib in
+				(libgcc_s|ld-linux)			;;
 				(libz|libdl)				;;
 				(libextractor|libextractor_common)	;;
 				(libc|libm|libpthread)	;;
@@ -194,7 +189,6 @@ for i in $RPM_BUILD_ROOT%plugindir/*.so;
 	}
 done
 
-ln -s dummy $RPM_BUILD_ROOT%plugindir/libextractor-thumbnail.so
 rm -f $RPM_BUILD_ROOT%_infodir/dir
 
 mv $RPM_BUILD_ROOT%_bindir/{,libextractor-}extract
@@ -217,26 +211,18 @@ test $1 != 0 || /sbin/install-info --inf
 %postun -p /sbin/ldconfig
 
 
-%post  plugins-thumbnailgtk
-/usr/sbin/update-alternatives --install \
-	%plugindir/libextractor_thumbnail.so   libextractor_thumbnail %plugindir/libextractor_thumbnailgtk.so 10
-
-%preun plugins-thumbnailgtk
-test "$1" != 0 || \
-	/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailgtk.so
-
-%post  plugins-thumbnailqt
-/usr/sbin/update-alternatives --install \
-	%plugindir/libextractor_thumbnail.so   libextractor_thumbnail %plugindir/libextractor_thumbnailqt.so  20
-
-%preun plugins-thumbnailqt
-test "$1" != 0 || \
-	/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailqt.so
+# TODO: remove me in F-15
+%triggerpostun plugins-thumbnailgtk -- libextractor-plugins-thumbnailgtk < 0.6
+/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailgtk.so &>/dev/null || :
+
+# TODO: remove me in F-15
+%triggerpostun plugins-thumbnailqt -- libextractor-plugins-thumbnailqt < 0.6
+/usr/sbin/update-alternatives --remove libextractor_thumbnail %plugindir/libextractor_thumbnailqt.so &>/dev/null || :
 
 
 %files -f libextractor.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS PLATFORMS README* TODO
+%doc AUTHORS COPYING ChangeLog NEWS README* TODO
 %_bindir/*
 %_libdir/*.so.*
 %_infodir/*info*
@@ -256,7 +242,14 @@ test "$1" != 0 || \
 
 
 %changelog
-* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.23-1304 
+* Sat Jan 16 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.0-1300
+- updated to 0.6.0
+- removed -pluginpath patch; upstream changed plugin loading mechanism
+  which fixed the problem solved by the patch
+- removed 'update-alternatives' registration of thumbnail* plugins; it
+  conflicts with new loading mechanism
+
+* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.23-1304
 - rebuild (exiv2)
 
 * Sun Nov 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.23-1303


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Sep 2009 18:13:25 -0000	1.9
+++ sources	16 Jan 2010 16:23:09 -0000	1.10
@@ -1 +1,2 @@
-d10fe30a595669e419f31777b2ab34ec  libextractor-0.5.23.tar.gz
+aaf648989edbd1510f72bcf75ab72e59  libextractor-0.6.0.tar.gz
+78b215bb81829bc4c2426faa1a90b42e  libextractor-0.6.0.tar.gz.sig


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/libextractor/devel/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:44:59 -0000	1.1
+++ verinfo	16 Jan 2010 16:23:09 -0000	1.2
@@ -1,2 +1,2 @@
-http://gnunet.org/libextractor/download/
+http://ftp.gnu.org/gnu/libextractor/
 libextractor-(.*?)\.tar\.


--- plugindir.patch DELETED ---

More information about the scm-commits mailing list