rpms/id3lib/devel .cvsignore, 1.3, 1.4 id3lib.spec, 1.15, 1.16 sources, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32029

Modified Files:
	.cvsignore id3lib.spec sources 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-18
- Fix multilib api documentation conflict (bz 341551)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Jun 2005 15:01:02 -0000	1.3
+++ .cvsignore	21 Oct 2007 12:42:19 -0000	1.4
@@ -1,2 +1,3 @@
 id3lib-3.8.3.tar.gz
 id3lib-3.8.3-libtool-autofoo.patch.bz2
+id3lib-3.8.3-doxygen-docs.tar.gz


Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- id3lib.spec	20 Aug 2007 21:08:15 -0000	1.15
+++ id3lib.spec	21 Oct 2007 12:42:19 -0000	1.16
@@ -1,17 +1,20 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/id3lib/%{name}-%{version}.tar.gz
+# Prebuild doxygen docs, to avoid multilib conflicts. To generate: untar and
+# configure, make docs, tar cvfz %{name}-%{version}-doxygen-docs.tar.gz doc/api
+Source1:	%{name}-%{version}-doxygen-docs.tar.gz
 Patch0:		id3lib-dox.patch
 Patch1:		id3lib-3.8.3-libtool-autofoo.patch.bz2
 Patch2:		id3lib-3.8.3-io_helpers-163101.patch
 Patch3:		id3lib-3.8.3-mkstemp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	zlib-devel doxygen
+BuildRequires:	zlib-devel
 
 %description
 This package provides a software library for manipulating ID3v1 and
@@ -34,7 +37,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p0
 %patch1 -p1 -b .libtool-autofoo
 %patch2 -p1 -b .io_helpers-163101
@@ -53,7 +56,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT __doc
 make install DESTDIR=$RPM_BUILD_ROOT
-make docs
 mkdir -p __doc/doc ; cp -p doc/*.{gif,jpg,png,html,txt,ico,css,php}  __doc/doc
 rm -f $RPM_BUILD_ROOT%{_libdir}/libid3.la
 
@@ -85,6 +87,9 @@
 
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-18
+- Fix multilib api documentation conflict (bz 341551)
+
 * Mon Aug 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-17
 - Use mkstemp instead of insecure tempfile creation (bz 253553)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Jun 2005 15:01:02 -0000	1.3
+++ sources	21 Oct 2007 12:42:19 -0000	1.4
@@ -1,2 +1,3 @@
 19f27ddd2dda4b2d26a559a4f0f402a7  id3lib-3.8.3.tar.gz
 ce106e4386e4fbc0d49aea9fbd14eb4b  id3lib-3.8.3-libtool-autofoo.patch.bz2
+1735dc895b499f51abda41a02e3f1051  id3lib-3.8.3-doxygen-docs.tar.gz