rpms/id3lib/EL-5 id3lib-3.8.3-includes.patch, NONE, 1.1 id3lib.spec, 1.14, 1.15
Adrian Reber (adrian)
fedora-extras-commits at redhat.com
Fri Aug 8 06:31:03 UTC 2008
Author: adrian
Update of /cvs/extras/rpms/id3lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5222
Modified Files:
id3lib.spec
Added Files:
id3lib-3.8.3-includes.patch
Log Message:
sync with devel branch for initial EL-5 release
id3lib-3.8.3-includes.patch:
--- NEW FILE id3lib-3.8.3-includes.patch ---
diff -up id3lib-3.8.3/include/id3/id3lib_strings.h~ id3lib-3.8.3/include/id3/id3lib_strings.h
--- id3lib-3.8.3/include/id3/id3lib_strings.h~ 2003-03-02 02:23:00.000000000 +0200
+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-01-04 01:30:52.000000000 +0200
@@ -29,6 +29,7 @@
#ifndef _ID3LIB_STRINGS_H_
#define _ID3LIB_STRINGS_H_
+#include <cstring>
#include <string>
#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
diff -up id3lib-3.8.3/configure.in~ id3lib-3.8.3/configure.in
--- id3lib-3.8.3/configure.in~ 2008-01-04 11:39:01.000000000 +0100
+++ id3lib-3.8.3/configure.in 2008-01-04 11:39:01.000000000 +0100
@@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomani
)
AC_CHECK_HEADERS( \
string \
- iomanip.h \
,,AC_MSG_ERROR([Missing a vital header file for id3lib])
)
diff -up id3lib-3.8.3/configure~ id3lib-3.8.3/configure
--- id3lib-3.8.3/configure~ 2008-01-04 11:39:10.000000000 +0100
+++ id3lib-3.8.3/configure 2008-01-04 11:39:10.000000000 +0100
@@ -22976,7 +22976,6 @@ done
for ac_header in \
string \
- iomanip.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff -up id3lib-3.8.3/include/id3/writers.h~ id3lib-3.8.3/include/id3/writers.h
--- id3lib-3.8.3/include/id3/writers.h~ 2008-01-04 11:59:39.000000000 +0100
+++ id3lib-3.8.3/include/id3/writers.h 2008-01-04 11:59:39.000000000 +0100
@@ -28,9 +28,9 @@
#ifndef _ID3LIB_WRITERS_H_
#define _ID3LIB_WRITERS_H_
+#include <cstring>
#include "id3/writer.h"
#include "id3/id3lib_streams.h"
-//#include <string.h>
class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
{
diff -up id3lib-3.8.3/examples/demo_info.cpp~ id3lib-3.8.3/examples/demo_info.cpp
--- id3lib-3.8.3/examples/demo_info.cpp~ 2008-01-04 12:00:56.000000000 +0100
+++ id3lib-3.8.3/examples/demo_info.cpp 2008-01-04 12:00:56.000000000 +0100
@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT
#define DEBUG
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
ID3D_INIT_DOUT();
diff -up id3lib-3.8.3/examples/demo_copy.cpp~ id3lib-3.8.3/examples/demo_copy.cpp
--- id3lib-3.8.3/examples/demo_copy.cpp~ 2008-01-04 12:01:26.000000000 +0100
+++ id3lib-3.8.3/examples/demo_copy.cpp 2008-01-04 12:01:26.000000000 +0100
@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag
}
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
int ulFlag = ID3TT_ID3;
ID3D_INIT_DOUT();
diff -up id3lib-3.8.3/examples/demo_convert.cpp~ id3lib-3.8.3/examples/demo_convert.cpp
--- id3lib-3.8.3/examples/demo_convert.cpp~ 2008-01-04 12:01:20.000000000 +0100
+++ id3lib-3.8.3/examples/demo_convert.cpp 2008-01-04 12:01:20.000000000 +0100
@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag
}
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
flags_t ulFlag = ID3TT_ALL;
gengetopt_args_info args;
diff -up id3lib-3.8.3/examples/demo_tag.cpp~ id3lib-3.8.3/examples/demo_tag.cpp
--- id3lib-3.8.3/examples/demo_tag.cpp~ 2008-01-04 12:01:41.000000000 +0100
+++ id3lib-3.8.3/examples/demo_tag.cpp 2008-01-04 12:01:41.000000000 +0100
@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag
os << "v2";
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
int ulFlag = ID3TT_ID3;
ID3D_INIT_DOUT();
Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/EL-5/id3lib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- id3lib.spec 20 Aug 2007 21:51:21 -0000 1.14
+++ id3lib.spec 8 Aug 2008 06:30:33 -0000 1.15
@@ -1,17 +1,18 @@
-Summary: Library for manipulating ID3v1 and ID3v2 tags
-Name: id3lib
-Version: 3.8.3
-Release: 17%{?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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: zlib-devel doxygen
+Summary: Library for manipulating ID3v1 and ID3v2 tags
+Name: id3lib
+Version: 3.8.3
+Release: 20%{?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
@@ -24,13 +25,13 @@
%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
@@ -39,10 +40,13 @@
%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
@@ -54,7 +58,10 @@
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
+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
@@ -78,13 +85,25 @@
%files devel
%defattr(-,root,root,-)
-%doc doc/api/
+%doc doc/id3lib.css doc/api/
%{_includedir}/id3.h
%{_includedir}/id3/
%{_libdir}/libid3.so
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.8.3-20
+- Autorebuild for GCC 4.3
+
+* 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)
+
* 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)
More information about the fedora-extras-commits
mailing list