SPECS: linphone.spec - updated system-libs patch is back, use syst...

[qboosh]

Author: qboosh                       Date: Thu Mar 23 11:37:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated system-libs patch is back, use system ortp too
- more cleanups, updated deps

---- Files affected:
SPECS:
   linphone.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/linphone.spec
diff -u SPECS/linphone.spec:1.40 SPECS/linphone.spec:1.41
--- SPECS/linphone.spec:1.40	Thu Mar 23 11:33:27 2006
+++ SPECS/linphone.spec	Thu Mar 23 12:37:08 2006
@@ -2,7 +2,6 @@
 # TODO:
 #  - split main package to few smaller (there is linphonec for console,
 #    auto-answering machine and linphone applet for gnome)
-#  - check why --enable-alsa doesn't require alsa-lib-devel
 #  - check if all this configure option I've set are really needed
 #  - separate libraries that do not require gnome into subpackages for Jingle support in kopete
 Summary:	Linphone Internet Phone
@@ -15,9 +14,9 @@
 Source0:	http://simon.morlat.free.fr/download/1.3.x/source/%{name}-%{version}.tar.gz
 # Source0-md5:	ace3e79cc0424d7a4fd134e38be153aa
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-automake.patch
-#Patch2:		%{name}-system-libs.patch
+Patch1:		%{name}-system-libs.patch
 URL:		http://www.linphone.org/
+BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	ffmpeg-devel >= 0.4.5
@@ -25,11 +24,14 @@
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gtk-doc
+BuildRequires:	jack-audio-connection-kit-devel >= 0.15.0
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgsm-devel >= 1.0.10
 BuildRequires:	libosip2-devel >= 2.2.0
+BuildRequires:	libsamplerate-devel >= 0.0.13
 BuildRequires:	libtool >= 1:1.4.2-9
-#BuildRequires:	lpc10-devel >= 1.5
+BuildRequires:	lpc10-devel >= 1.5
+BuildRequires:	ortp-devel >= 0.9.1
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.98
 BuildRequires:	scrollkeeper
@@ -37,6 +39,7 @@
 BuildRequires:	xft-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	/usr/bin/scrollkeeper-update
+Requires:	ortp >= 0.9.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,8 +73,17 @@
 Summary:	Linphone Internet Phone - header files
 Summary(pl):	Telefon internetowy Linphone - pliki nagłówkowe
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	alsa-lib-devel >= 0.9.0
+Requires:	glib2-devel >= 2.0.0
 Requires:	gtk-doc-common
+Requires:	jack-audio-connection-kit-devel >= 0.15.0
+Requires:	libgsm-devel >= 1.0.10
+Requires:	libosip2-devel >= 2.2.0
+Requires:	libsamplerate-devel >= 0.0.13
+Requires:	lpc10-devel >= 1.5
+Requires:	ortp-devel >= 0.9.1
+Requires:	speex-devel >= 1.0.0
 
 %description devel
 Development files for the Linphone Internet Phone.
@@ -83,7 +95,7 @@
 Summary:	Linphone static libraries
 Summary(pl):	Statyczne biblioteki Linphone
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static version of Linphone libraries.
@@ -95,7 +107,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 
 %build
 # requires .po file fixes
@@ -103,17 +114,10 @@
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-cd oRTP
-	%{__libtoolize}
-	%{__aclocal}
-	%{__autoconf}
-	# don't use -f here
-	automake -a -c --foreign
-cd ..
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
-	--enable-platform-gnome-2 \
 	--enable-alsa \
 	--enable-ipv6
 %{__make}
@@ -149,7 +153,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/liblinphone.so.*.*.*
 %attr(755,root,root) %{_libdir}/linphone_applet
 %{_libdir}/mediastream
 %{_libdir}/bonobo/servers/GNOME_LinphoneApplet.server
@@ -161,16 +165,15 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/liblinphone.so
+%{_libdir}/liblinphone.la
 %{_includedir}/linphone
-%{_includedir}/ortp
-%{_gtkdocdir}/*
+%{_gtkdocdir}/mediastreamer
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/liblinphone.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -178,6 +181,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/03/23 11:37:08  qboosh
+- updated system-libs patch is back, use system ortp too
+- more cleanups, updated deps
+
 Revision 1.40  2006/03/23 10:33:27  qboosh
 - cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linphone.spec?r1=1.40&r2=1.41&f=u