# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346173230 -7200 # Node ID aba05e03de0f5dbf7b277e4f2b61599fecc9f78f # Parent 03d66ab4c7cabf9a7a627e1cd890f9e5d5437ccb Patch to conform to current ISO C++ standard, resulting in a successful build. Additionally modernize packaging in accordance with current OpenPKG boilerplate. diff -r 03d66ab4c7ca -r aba05e03de0f id3lib/id3lib.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/id3lib/id3lib.patch Tue Aug 28 19:00:30 2012 +0200 @@ -0,0 +1,22 @@ +Index: include/id3/id3lib_strings.h +--- include/id3/id3lib_strings.h.orig 2012-08-29 11:12:19.139220051 +0200 ++++ include/id3/id3lib_strings.h 2012-08-29 11:10:08.246368381 +0200 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include ++#include + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +Index: include/id3/writers.h +--- include/id3/writers.h.orig 2012-08-29 11:11:54.826330076 +0200 ++++ include/id3/writers.h 2012-08-29 11:12:07.554666839 +0200 +@@ -31,6 +31,7 @@ + #include "id3/writer.h" + #include "id3/id3lib_streams.h" + //#include ++#include + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { diff -r 03d66ab4c7ca -r aba05e03de0f id3lib/id3lib.spec --- a/id3lib/id3lib.spec Tue Aug 28 19:00:20 2012 +0200 +++ b/id3lib/id3lib.spec Tue Aug 28 19:00:30 2012 +0200 @@ -1,6 +1,6 @@ ## ## id3lib.spec -- OpenPKG RPM Specification -## Copyright (c) 2009 Michael Schloh von Bennewitz +## Copyright (c) 2012 Michael Schloh von Bennewitz ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -33,18 +33,15 @@ Group: Audio License: LGPL Version: 3.8.3 -Release: 20090106 +Release: 20120800 # list of sources Source0: http://switch.dl.sourceforge.net/id3lib/id3lib-%{version}.tar.gz +Patch0: id3lib.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, gcc::with_cxx = yes -PreReq: OpenPKG, openpkg >= 20040130 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes +PreReq: OpenPKG, openpkg >= 20100101 %description id3lib is an Opensource, cross platform software development library @@ -64,6 +61,10 @@ %prep # unpack sources %setup -q + %patch -p0 + %{l_shtool} subst \ + -e 's;iomanip\.h;iomanip;' \ + configure %build # prepare configuration @@ -81,9 +82,6 @@ %{l_make} %{l_mflags -O} %install - # remove previously existing installations - rm -rf $RPM_BUILD_ROOT - # run the native installation logic %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT @@ -96,5 +94,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT