rpms/rtaudio/F-12 rtaudio-fix-soname.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rtaudio.spec, 1.3, 1.4 sources, 1.3, 1.4 rtaudio-gcc44.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/rtaudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24822

Modified Files:
	.cvsignore rtaudio.spec sources 
Added Files:
	rtaudio-fix-soname.patch 
Removed Files:
	rtaudio-gcc44.patch 
Log Message:
* Fri Feb 05 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 4.0.7-1
- Update to 4.0.7
- Upstream is supporting shared libraries now. Drop the static library


rtaudio-fix-soname.patch:
 Makefile.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE rtaudio-fix-soname.patch ---
diff -rupN rtaudio-4.0.7.old/Makefile.in rtaudio-4.0.7/Makefile.in
--- rtaudio-4.0.7.old/Makefile.in	2010-02-04 13:55:39.000000000 -0500
+++ rtaudio-4.0.7/Makefile.in	2010-02-05 23:46:32.000000000 -0500
@@ -24,7 +24,9 @@ tests:
 $(LIBRARIES): $(OBJECTS)
 	$(AR) ruv $(STATIC) $(OBJECTS)
 	ranlib $(STATIC)
-	$(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@
+	$(CC) -shared -Wl,-soname,$(SHARED).0 $(OBJECTS) -o $(SHARED).0.0 @LIBS@
+	ln -sf $(SHARED).0.0 $(SHARED).0
+	ln -sf $(SHARED).0.0 $(SHARED)
 
 %.o : %.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtaudio/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Jun 2009 02:42:05 -0000	1.3
+++ .cvsignore	6 Feb 2010 06:31:05 -0000	1.4
@@ -1 +1 @@
-rtaudio-4.0.6-fe.tar.gz
+rtaudio-4.0.7-fe.tar.gz


Index: rtaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtaudio/F-12/rtaudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rtaudio.spec	27 Jul 2009 03:18:25 -0000	1.3
+++ rtaudio.spec	6 Feb 2010 06:31:06 -0000	1.4
@@ -1,24 +1,24 @@
-# Don't create a debuginfo package since it would be empty
-%define debug_package %{nil}
-
 Summary:        Real-time Audio I/O Library
 Name:           rtaudio
-Version:        4.0.6
-Release:        2%{?dist}
+Version:        4.0.7
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.music.mcgill.ca/~gary/rtaudio/
 # The original tarball contains nonfree bits. We remove them and create a free tarball:
-#    wget -N http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.6.tar.gz
-#    tar zxf rtaudio-4.0.6.tar.gz
-#    rm -fr rtaudio-4.0.6/include/ rtaudio-4.0.6/tests/Windows
-#    tar zcf rtaudio-4.0.6-fe.tar.gz rtaudio-4.0.6
+#    VERSION=4.0.7
+#    wget -N http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-$VERSION.tar.gz
+#    tar zxf rtaudio-$VERSION.tar.gz
+#    rm -fr rtaudio-$VERSION/include/ rtaudio-$VERSION/tests/Windows
+#    tar zcf rtaudio-$VERSION-fe.tar.gz rtaudio-$VERSION
 Source0:        %{name}-%{version}-fe.tar.gz
-# Make rtaudio compilable against gcc-4.4
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2644431&group_id=162430&atid=823757
-Patch1:         rtaudio-gcc44.patch
+# Upstream supports shared libraries, but they don't put proper sonames. Fix:
+Patch0:         %{name}-fix-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel doxygen
+BuildRequires:  alsa-lib-devel
+BuildRequires:  jack-audio-connection-kit-devel
+# No longer providing static library only
+Obsoletes:      rtaudio-devel < 4.0.7
 
 %description
 RtAudio is a set of C++ classes that provide a common API for realtime audio
@@ -39,7 +39,7 @@ designed with the following objectives:
 %package devel
 Summary:        Real-time Audio I/O Library
 Group:          System Environment/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 RtAudio is a set of C++ classes that provide a common API for realtime audio
@@ -58,10 +58,7 @@ designed with the following objectives:
 
 %prep
 %setup -q
-%patch1 -p1
-
-# We are going to build the doxygen documentation from source
-rm -fr doc/html
+%patch0 -p1 -b .soname
 
 # Remove empty directory
 rm -fr tests/Debug
@@ -77,27 +74,35 @@ export CFLAGS="%optflags -fPIC"
 %configure --with-jack --with-alsa
 make %{?_smp_mflags}
 
-# Doxygen documentation:
-pushd doc/doxygen
-   doxygen
-popd
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_includedir} %{buildroot}%{_libdir}
 cp -a RtAudio.h RtError.h %{buildroot}%{_includedir}
-cp -a lib%{name}.a %{buildroot}%{_libdir}
+cp -a lib%{name}.so* %{buildroot}%{_libdir}
 
 %clean
 rm -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc readme doc/release.txt
+%{_libdir}/lib%{name}.so.*
+
 %files devel
 %defattr(-,root,root,-)
-%doc readme doc/release.txt doc/html doc/images tests
+%doc doc/html doc/images tests
 %{_includedir}/*.h
-%{_libdir}/lib%{name}.a
+%{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Feb 05 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 4.0.7-1
+- Update to 4.0.7
+- Upstream is supporting shared libraries now. Drop the static library
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtaudio/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Jun 2009 02:42:06 -0000	1.3
+++ sources	6 Feb 2010 06:31:06 -0000	1.4
@@ -1 +1 @@
-78b9e39ca3dd541bb51d77962dc2e869  rtaudio-4.0.6-fe.tar.gz
+4dbfa6b3f5ce714febdb91a5ef53f234  rtaudio-4.0.7-fe.tar.gz


--- rtaudio-gcc44.patch DELETED ---