rpms/id3lib/devel id3lib.spec,1.16,1.17

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	id3lib.spec 
Log Message:
* Fri Dec  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-19
- Fix building of id3lib and programs using it with gcc34
- Drop prebuild doxygen docs, now that doxygen is fixed to not cause multilib
  conflicts
- Convert some docs to UTF-8 



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- id3lib.spec	21 Oct 2007 12:42:19 -0000	1.16
+++ id3lib.spec	4 Jan 2008 12:56:28 -0000	1.17
@@ -1,20 +1,18 @@
-Summary:	Library for manipulating ID3v1 and ID3v2 tags
-Name:		id3lib
-Version:	3.8.3
-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
+Summary:        Library for manipulating ID3v1 and ID3v2 tags
+Name:           id3lib
+Version:        3.8.3
+Release:        19%{?dist}
+License:        LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://id3lib.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/id3lib/%{name}-%{version}.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
+Patch4:         id3lib-3.8.3-includes.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  zlib-devel doxygen
 
 %description
 This package provides a software library for manipulating ID3v1 and
@@ -27,25 +25,28 @@
 
 
 %package devel
-Summary:	Development tools for the id3lib library
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	zlib-devel
+Summary:        Development tools for the id3lib library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlib-devel
 
 %description devel
-This package provides files needed to develop with the id3lib.
+This package provides files needed to develop with the id3lib library.
 
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p0
 %patch1 -p1 -b .libtool-autofoo
 %patch2 -p1 -b .io_helpers-163101
 %patch3 -p1 -b .mkstemp
+%patch4 -p1 -b .gcc43
 chmod -x src/*.h src/*.cpp include/id3/*.h
 sed -i -e 's/\r//' doc/id3v2.3.0.*
 sed -i -e 's|@DOX_DIR_HTML@|%{_docdir}/%{name}-devel-%{version}/api|' \
-	doc/index.html.in
+  doc/index.html.in
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp; mv tmp ChangeLog
+iconv -f ISO-8859-1 -t UTF8 THANKS > tmp; mv tmp THANKS
 
 
 %build
@@ -56,7 +57,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT __doc
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p __doc/doc ; cp -p doc/*.{gif,jpg,png,html,txt,ico,css,php}  __doc/doc
+make docs
+for i in txt html; do
+  iconv -f ISO-8859-1 -t UTF8 doc/id3v2.3.0.$i > tmp; mv tmp doc/id3v2.3.0.$i
+done
+mkdir -p __doc/doc ; cp -p doc/*.{gif,jpg,png,html,txt,ico,css}  __doc/doc
 rm -f $RPM_BUILD_ROOT%{_libdir}/libid3.la
 
 
@@ -80,13 +85,19 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/api/
+%doc doc/id3lib.css doc/api/
 %{_includedir}/id3.h
 %{_includedir}/id3/
 %{_libdir}/libid3.so
 
 
 %changelog
+* Fri Dec  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-19
+- Fix building of id3lib and programs using it with gcc34
+- Drop prebuild doxygen docs, now that doxygen is fixed to not cause multilib
+  conflicts
+- Convert some docs to UTF-8 
+
 * 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)