devel/linphone linphone-1.0.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 linphone.spec, 1.7, 1.8 sources, 1.2, 1.3 linphone-0.12.2-docs.patch, 1.1, NONE linphone-0.12.2-pkgconfig.patch, 1.2, NONE linphone-0.12.2-speex.patch, 1.1, NONE
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Thu Mar 24 19:32:20 UTC 2005
Author: ivazquez
Update of /cvs/extras/devel/linphone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11929
Modified Files:
.cvsignore linphone.spec sources
Added Files:
linphone-1.0.1-pkgconfig.patch
Removed Files:
linphone-0.12.2-docs.patch linphone-0.12.2-pkgconfig.patch
linphone-0.12.2-speex.patch
Log Message:
Upstream update, separated ortp
linphone-1.0.1-pkgconfig.patch:
--- NEW FILE linphone-1.0.1-pkgconfig.patch ---
--- linphone-0.12.2/share/linphone.pc.in.orig 2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in 2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: liblinphone
--- linphone-1.0.1/share/Makefile.in.pkgconfig 2005-03-23 03:17:48.000000000 -0500
+++ linphone-1.0.1/share/Makefile.in 2005-03-24 13:40:41.828557116 -0500
@@ -286,7 +286,7 @@
#to be compliant with freedesktop.org:
linphone_fddir = $(prefix)/share/applications/
linphone_fd_DATA = linphone.desktop
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = linphone.pc
EXTRA_DIST = $(LINPHONE_SOUNDS) \
$(LINPHONE_RINGS) \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/linphone/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Mar 2005 17:12:25 -0000 1.2
+++ .cvsignore 24 Mar 2005 19:32:18 -0000 1.3
@@ -1 +1 @@
-linphone-0.12.2.tar.gz
+linphone-1.0.1.tar.gz
Index: linphone.spec
===================================================================
RCS file: /cvs/extras/devel/linphone/linphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linphone.spec 24 Mar 2005 02:17:47 -0000 1.7
+++ linphone.spec 24 Mar 2005 19:32:18 -0000 1.8
@@ -1,19 +1,17 @@
Name: linphone
-Version: 0.12.2
-Release: 7
+Version: 1.0.1
+Release: 1
Summary: Phone anywhere in the whole world by using the Internet
Group: Applications/Communications
License: GPL
URL: http://www.linphone.org/?lang=us&rubrique=1
-Source0: http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
-Patch: linphone-0.12.2-docs.patch
-Patch1: linphone-0.12.2-speex.patch
-Patch2: linphone-0.12.2-pkgconfig.patch
+Source0: http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz
+Patch: linphone-1.0.1-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires: libosip-devel speex-devel gettext
+BuildRequires: libosip2-devel speex-devel gettext desktop-file-utils
%description
Linphone is mostly sip compliant. It works successfully with these
@@ -37,15 +35,28 @@
Requires: %{name} = %{version}-%{release} glib2-devel
%description devel
-Libraries required to develop software with linphone
+Libraries and headers required to develop software with linphone.
+
+%package -n ortp
+Summary: A C library implementing the RTP protocol (rfc1889)
+Group: System Environment/Libraries
+Version: 0.7.0
+
+%description -n ortp
+oRTP is a LGPL licensed C library implementing the RTP protocol (rfc1889). It
+is available for most *nix clones (primilarly Linux and HP-UX), and Win32.
+
+%package -n ortp-devel
+Summary: Development libraries for ortp
+Group: Development/Libraries
+Version: 0.7.0
+
+%description -n ortp-devel
+Libraries and headers required to develop software with ortp.
%prep
%setup -q
-%patch -p 1 -b .docs
-%patch1 -p 1 -b .speex
-%patch2 -p 1 -b .pkgconfig
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
-rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
+%patch -p 1 -b .pkgconfig
%build
%configure
@@ -55,6 +66,15 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
+desktop-file-install --vendor=fedora \
+ --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Network \
+ --add-category X-Fedora \
+ --add-category Internet \
+ --add-category Telephony \
+ --add-category GTK \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -63,30 +83,53 @@
%postun -p /sbin/ldconfig
+%post -n ortp -p /sbin/ldconfig
+
+%postun -n ortp -p /sbin/ldconfig
+
%files -f %{name}.lang
%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/bonobo/servers/*.server
-%{_libdir}/*.so.*
+%{_libdir}/liblinphone.so.*
%{_libexecdir}/*
%{_mandir}/man1/*
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/gnome/apps/Internet/*.desktop
%{_datadir}/gnome/help/linphone
%{_datadir}/gnome-2.0/ui/*.xml
%{_datadir}/gtk-doc/html/mediastreamer
-%{_datadir}/linphonec
%{_datadir}/pixmaps/linphone
%{_datadir}/sounds/linphone
%files devel
%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
+%{_datadir}/gtk-doc/html/ortp
+%{_includedir}/linphone
+%{_libdir}/liblinphone.a
+%{_libdir}/liblinphone.la
+%{_libdir}/liblinphone.so
%{_libdir}/pkgconfig/*
+%files -n ortp
+%defattr(-,root,root)
+%doc oRTP/AUTHORS oRTP/ChangeLog oRTP/COPYING oRTP/NEWS oRTP/README oRTP/TODO oRTP/
+%{_libdir}/libortp.so.*
+
+%files -n ortp-devel
+%defattr(-,root,root)
+%{_includedir}/ortp
+%{_libdir}/libortp.a
+%{_libdir}/libortp.la
+%{_libdir}/libortp.so
+
%changelog
+* Thu Mar 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.1-1
+- Upstream update
+- Separated ortp
+- Added %%doc
+
* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
- pkgconfig and -devel fixes
Index: sources
===================================================================
RCS file: /cvs/extras/devel/linphone/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Mar 2005 17:12:25 -0000 1.2
+++ sources 24 Mar 2005 19:32:18 -0000 1.3
@@ -1 +1 @@
-86c01dbbcdb41786229f51ec0994ff67 linphone-0.12.2.tar.gz
+d65f977dd6512b7725fcb2e2c9713e65 linphone-1.0.1.tar.gz
--- linphone-0.12.2-docs.patch DELETED ---
--- linphone-0.12.2-pkgconfig.patch DELETED ---
--- linphone-0.12.2-speex.patch DELETED ---
More information about the fedora-extras-commits
mailing list