rpms/libcddb/devel libcddb-1.3.0-multilib.patch, NONE, 1.1 libcddb.spec, 1.22, 1.23

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	libcddb.spec 
Added Files:
	libcddb-1.3.0-multilib.patch 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-3
- Fix multilib conflict in version.h (bz 341971)


libcddb-1.3.0-multilib.patch:

--- NEW FILE libcddb-1.3.0-multilib.patch ---
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@


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libcddb.spec	13 Aug 2007 17:01:01 -0000	1.22
+++ libcddb.spec	21 Oct 2007 12:50:10 -0000	1.23
@@ -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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-3
+- Fix multilib conflict in version.h (bz 341971)
+
 * Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-2
 - Update License tag for new Licensing Guidelines compliance