diff --git a/libcddb-1.3.0-multilib.patch b/libcddb-1.3.0-multilib.patch new file mode 100644 index 0000000..87c8c04 --- /dev/null +++ b/libcddb-1.3.0-multilib.patch @@ -0,0 +1,12 @@ +diff -up libcddb-1.3.0/include/cddb/version.h.in~ libcddb-1.3.0/include/cddb/version.h.in +--- libcddb-1.3.0/include/cddb/version.h.in~ 2007-10-21 14:43:43.000000000 +0200 ++++ libcddb-1.3.0/include/cddb/version.h.in 2007-10-21 14:43:43.000000000 +0200 +@@ -6,7 +6,7 @@ + */ + + /*! CDDB_VERSION can as a string in programs to show what version is used. */ +-#define CDDB_VERSION "@VERSION@ @build@" ++#define CDDB_VERSION "@VERSION@ Fedora" + + /*! LIBCDDB_VERSION_NUM can be used for testing in the C preprocessor */ + #define LIBCDDB_VERSION_NUM @LIBCDDB_VERSION_NUM@ diff --git a/libcddb.spec b/libcddb.spec index 6ac891d..b85c88b 100644 --- a/libcddb.spec +++ b/libcddb.spec @@ -1,11 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ Source0: http://downloads./sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 +Patch0: libcddb-1.3.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig, libcdio-devel >= 0.67 @@ -29,6 +30,7 @@ for libcddb. %prep %setup -q +%patch0 -p1 %build @@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 21 2007 Hans de Goede 1.3.0-3 +- Fix multilib conflict in version.h (bz 341971) + * Mon Aug 13 2007 Hans de Goede 1.3.0-2 - Update License tag for new Licensing Guidelines compliance