packages: libfreebob/libfreebob.spec, libfreebob/libfreebob-gcc46.patch (NE...

[baggins]

Author: baggins                      Date: Mon Apr 18 12:20:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- another gcc build fixes
- remove libtool file

---- Files affected:
packages/libfreebob:
   libfreebob.spec (1.9 -> 1.10) , libfreebob-gcc46.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libfreebob/libfreebob.spec
diff -u packages/libfreebob/libfreebob.spec:1.9 packages/libfreebob/libfreebob.spec:1.10
--- packages/libfreebob/libfreebob.spec:1.9	Mon Apr 18 12:31:20 2011
+++ packages/libfreebob/libfreebob.spec	Mon Apr 18 14:20:38 2011
@@ -9,6 +9,7 @@
 Source0:	http://dl.sourceforge.net/freebob/%{name}-%{version}.tar.gz
 # Source0-md5:	e49eed0084b9e793e7a0713aa99c196c
 Patch0:		%{name}-gcc43.patch
+Patch1:		%{name}-gcc46.patch
 URL:		http://freebob.sourceforge.net/
 BuildRequires:	alsa-lib-devel >= 1.0.0
 BuildRequires:	libavc1394-devel >= 0.5.3
@@ -60,6 +61,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -71,6 +73,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfreebob.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,7 +90,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfreebob.so
-%{_libdir}/libfreebob.la
 %{_includedir}/libfreebob
 %{_pkgconfigdir}/libfreebob.pc
 
@@ -100,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/04/18 12:20:38  baggins
+- another gcc build fixes
+- remove libtool file
+
 Revision 1.9  2011/04/18 10:31:20  baggins
 - rel 4
 

================================================================
Index: packages/libfreebob/libfreebob-gcc46.patch
diff -u /dev/null packages/libfreebob/libfreebob-gcc46.patch:1.1
--- /dev/null	Mon Apr 18 14:20:43 2011
+++ packages/libfreebob/libfreebob-gcc46.patch	Mon Apr 18 14:20:38 2011
@@ -0,0 +1,66 @@
+diff -rupN libfreebob-1.0.11.old/src/libfreebobavc/avc_extended_plug_info.cpp libfreebob-1.0.11/src/libfreebobavc/avc_extended_plug_info.cpp
+--- libfreebob-1.0.11.old/src/libfreebobavc/avc_extended_plug_info.cpp	2007-10-15 14:15:08.000000000 -0400
++++ libfreebob-1.0.11/src/libfreebobavc/avc_extended_plug_info.cpp	2011-02-09 00:19:12.000000000 -0500
+@@ -120,7 +120,7 @@ ExtendedPlugInfoPlugNameSpecificData::de
+     return true;
+ }
+ 
+-ExtendedPlugInfoPlugNameSpecificData::ExtendedPlugInfoPlugNameSpecificData*
++typename ExtendedPlugInfoPlugNameSpecificData::ExtendedPlugInfoPlugNameSpecificData*
+ ExtendedPlugInfoPlugNameSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugNameSpecificData( *this );
+@@ -156,7 +156,7 @@ ExtendedPlugInfoPlugNumberOfChannelsSpec
+     return true;
+ }
+ 
+-ExtendedPlugInfoPlugNumberOfChannelsSpecificData::ExtendedPlugInfoPlugNumberOfChannelsSpecificData*
++typename ExtendedPlugInfoPlugNumberOfChannelsSpecificData::ExtendedPlugInfoPlugNumberOfChannelsSpecificData*
+ ExtendedPlugInfoPlugNumberOfChannelsSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugNumberOfChannelsSpecificData( *this );
+@@ -229,7 +229,7 @@ ExtendedPlugInfoPlugChannelPositionSpeci
+     return true;
+ }
+ 
+-ExtendedPlugInfoPlugChannelPositionSpecificData::ExtendedPlugInfoPlugChannelPositionSpecificData*
++typename ExtendedPlugInfoPlugChannelPositionSpecificData::ExtendedPlugInfoPlugChannelPositionSpecificData*
+ ExtendedPlugInfoPlugChannelPositionSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugChannelPositionSpecificData( *this );
+@@ -287,7 +287,7 @@ ExtendedPlugInfoPlugChannelNameSpecificD
+     return true;
+ }
+ 
+-ExtendedPlugInfoPlugChannelNameSpecificData::ExtendedPlugInfoPlugChannelNameSpecificData*
++typename ExtendedPlugInfoPlugChannelNameSpecificData::ExtendedPlugInfoPlugChannelNameSpecificData*
+ ExtendedPlugInfoPlugChannelNameSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugChannelNameSpecificData( *this );
+@@ -334,7 +334,7 @@ ExtendedPlugInfoPlugInputSpecificData::d
+     return m_plugAddress->deserialize( de );
+ }
+ 
+-ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData*
++typename ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData*
+ ExtendedPlugInfoPlugInputSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugInputSpecificData( *this );
+@@ -410,7 +410,7 @@ ExtendedPlugInfoPlugOutputSpecificData::
+     return true;
+ }
+ 
+-ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData*
++typename ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData*
+ ExtendedPlugInfoPlugOutputSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoPlugOutputSpecificData( *this );
+@@ -472,7 +472,7 @@ ExtendedPlugInfoClusterInfoSpecificData:
+     return true;
+ }
+ 
+-ExtendedPlugInfoClusterInfoSpecificData::ExtendedPlugInfoClusterInfoSpecificData*
++typename ExtendedPlugInfoClusterInfoSpecificData::ExtendedPlugInfoClusterInfoSpecificData*
+ ExtendedPlugInfoClusterInfoSpecificData::clone() const
+ {
+     return new ExtendedPlugInfoClusterInfoSpecificData( *this );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libfreebob/libfreebob.spec?r1=1.9&r2=1.10&f=u