rpms/libmusicbrainz3/devel libmusicbrainz-3.0.1-private.patch, NONE, 1.1 libmusicbrainz3.spec, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204

Modified Files:
	libmusicbrainz3.spec 
Added Files:
	libmusicbrainz-3.0.1-private.patch 
Log Message:
* Fri Jul 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-3
- fix recursive linking against libdiscid neon


libmusicbrainz-3.0.1-private.patch:

--- NEW FILE libmusicbrainz-3.0.1-private.patch ---
diff -up libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake
--- libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake.private	2007-05-11 17:55:10.000000000 -0500
+++ libmusicbrainz-3.0.1/libmusicbrainz3.pc.cmake	2008-07-25 10:56:33.000000000 -0500
@@ -7,7 +7,7 @@ Name: ${PROJECT_NAME}
 Description: The Musicbrainz Client Library.
 URL: http://musicbrainz.org/doc/libmusicbrainz
 Version: ${PROJECT_VERSION}
-Requires: neon >= 0.25, libdiscid
+Requires.private: neon >= 0.25, libdiscid
 Libs: -L${LIB_INSTALL_DIR} -lmusicbrainz3
 Cflags: -I${INCLUDE_INSTALL_DIR}
 


Index: libmusicbrainz3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmusicbrainz3.spec	24 Jul 2008 23:42:50 -0000	1.2
+++ libmusicbrainz3.spec	25 Jul 2008 16:01:23 -0000	1.3
@@ -4,14 +4,16 @@
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz3
 Version: 3.0.1 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org/
 Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstream these -- Rex
 Patch1: libmusicbrainz-3.0.1-gcc43.patch
+Patch2: libmusicbrainz-3.0.1-private.patch
 
 BuildRequires: cmake
 BuildRequires: libdiscid-devel
@@ -27,7 +29,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-# FIXME
+# patch2 likely fixes this , confirm w/upstream -- Rex
 Requires: libdiscid-devel neon-devel
 %description devel
 This package contains the headers that programmers will need to develop
@@ -38,6 +40,7 @@
 %setup -q -n libmusicbrainz-%{version}
 
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .private
 
 
 %build
@@ -67,16 +70,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt NEWS.txt README.txt
-%{_libdir}/lib*.so.*
+%{_libdir}/libmusicbrainz3.so.6*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/musicbrainz3/
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libmusicbrainz3.so
+%{_libdir}/pkgconfig/libmusicbrainz3.pc
 
 
 %changelog
+* Fri Jul 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-3
+- fix recursive linking against libdiscid neon
+
 * Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.1-2
 - BR: libdiscid-devel
 - -devel: Requires: libdiscid-devel neon-devel