diff --git a/.cvsignore b/.cvsignore index 4ae37c9..e7f7184 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -linphone-0.12.2.tar.gz +linphone-1.0.1.tar.gz diff --git a/linphone-0.12.2-docs.patch b/linphone-0.12.2-docs.patch deleted file mode 100644 index 545d76b..0000000 --- a/linphone-0.12.2-docs.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- linphone-0.12.2/oRTP/configure.orig 2005-01-21 11:24:48.993986731 -0500 -+++ linphone-0.12.2/oRTP/configure 2005-01-21 11:25:08.144473681 -0500 -@@ -20640,7 +20640,7 @@ - - - -- ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile build/Makefile build/win32/Makefile" -+ ac_config_files="$ac_config_files Makefile src/Makefile build/Makefile build/win32/Makefile" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -21206,7 +21206,6 @@ - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "build/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; - "build/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ---- linphone-0.12.2/oRTP/Makefile.am.orig 2005-01-21 11:28:40.834457361 -0500 -+++ linphone-0.12.2/oRTP/Makefile.am 2005-01-21 11:28:46.102490995 -0500 -@@ -6,7 +6,7 @@ - EXTRA_DIST=oRTP.prj ortp-config.h.in TODO - - --SUBDIRS=src docs build -+SUBDIRS=src build - - mod-dist: - mkdir oRTP-bin ---- linphone-0.12.2/osipua/configure.orig 2005-01-21 11:33:56.904478419 -0500 -+++ linphone-0.12.2/osipua/configure 2005-01-21 11:34:22.628759708 -0500 -@@ -22300,7 +22300,7 @@ - - - -- ac_config_files="$ac_config_files Makefile src/Makefile docs/Makefile" -+ ac_config_files="$ac_config_files Makefile src/Makefile" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -22852,7 +22852,6 @@ - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "osipua-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS osipua-config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ---- linphone-0.12.2/osipua/Makefile.am.orig 2005-01-21 11:34:02.887380950 -0500 -+++ linphone-0.12.2/osipua/Makefile.am 2005-01-21 11:34:29.713460135 -0500 -@@ -1,3 +1,3 @@ - EXTRA_DIST= osipua-config.h.in - --SUBDIRS=src docs -+SUBDIRS=src ---- linphone-0.12.2/oRTP/Makefile.in.orig 2005-03-15 21:27:48.740665660 -0500 -+++ linphone-0.12.2/oRTP/Makefile.in 2005-03-15 21:27:55.102342712 -0500 -@@ -110,7 +110,7 @@ - #dist... - EXTRA_DIST = oRTP.prj ortp-config.h.in TODO - --SUBDIRS = src docs build -+SUBDIRS = src build - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs ---- linphone-0.12.2/osipua/Makefile.in.orig 2005-03-15 21:43:26.476524155 -0500 -+++ linphone-0.12.2/osipua/Makefile.in 2005-03-15 21:43:31.467515812 -0500 -@@ -102,7 +102,7 @@ - osip_prefix = @osip_prefix@ - EXTRA_DIST = osipua-config.h.in - --SUBDIRS = src docs -+SUBDIRS = src - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/linphone-0.12.2-speex.patch b/linphone-0.12.2-speex.patch deleted file mode 100644 index 0061619..0000000 --- a/linphone-0.12.2-speex.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- linphone-0.12.2/Makefile.am.speex 2004-03-31 15:40:14.000000000 -0500 -+++ linphone-0.12.2/Makefile.am 2005-01-21 11:46:24.109386492 -0500 -@@ -6,11 +6,11 @@ - - if BUILD_SPEEX - SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \ -- $(WIN32ACM_DIR) speex mediastreamer \ -+ $(WIN32ACM_DIR) mediastreamer \ - media_api osipua coreapi console gnome share developer-docs - else - SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \ -- $(WIN32ACM_DIR) speex mediastreamer \ -+ $(WIN32ACM_DIR) mediastreamer \ - media_api osipua coreapi console gnome share developer-docs - endif - ---- linphone-0.12.2/Makefile.in.orig 2005-03-15 21:37:06.508714564 -0500 -+++ linphone-0.12.2/Makefile.in 2005-03-15 21:37:41.282614403 -0500 -@@ -157,11 +157,11 @@ - @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm - - @BUILD_SPEEX_TRUE@SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \ --@BUILD_SPEEX_TRUE@ $(WIN32ACM_DIR) speex mediastreamer \ -+@BUILD_SPEEX_TRUE@ $(WIN32ACM_DIR) mediastreamer \ - @BUILD_SPEEX_TRUE@ media_api osipua coreapi console gnome share developer-docs - - @BUILD_SPEEX_FALSE@SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \ --@BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) speex mediastreamer \ -+@BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) mediastreamer \ - @BUILD_SPEEX_FALSE@ media_api osipua coreapi console gnome share developer-docs - - diff --git a/linphone-0.12.2-pkgconfig.patch b/linphone-1.0.1-pkgconfig.patch similarity index 61% rename from linphone-0.12.2-pkgconfig.patch rename to linphone-1.0.1-pkgconfig.patch index 0bb61a9..d0dab6f 100644 --- a/linphone-0.12.2-pkgconfig.patch +++ b/linphone-1.0.1-pkgconfig.patch @@ -1,14 +1,3 @@ ---- linphone-0.12.2/share/Makefile.in.orig 2005-03-23 16:26:52.922690626 -0500 -+++ linphone-0.12.2/share/Makefile.in 2005-03-23 16:27:13.949932428 -0500 -@@ -184,7 +184,7 @@ - confexdir = $(datadir)/linphonec - confex_DATA = linphonec - --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = linphone.pc - - EXTRA_DIST = $(LINPHONE_SOUNDS) \ --- 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 @@ @@ -23,3 +12,14 @@ 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) \ diff --git a/linphone.spec b/linphone.spec index 4d37fbe..7bc6d6a 100644 --- a/linphone.spec +++ b/linphone.spec @@ -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 @@ Group: Development/Libraries 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 @@ make %{?_smp_mflags} 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 @@ rm -rf $RPM_BUILD_ROOT %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 1.0.1-1 +- Upstream update +- Separated ortp +- Added %%doc + * Wed Mar 23 2005 Ignacio Vazquez-Abrams 0.12.2-7 - pkgconfig and -devel fixes diff --git a/sources b/sources index f056067..8e88271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86c01dbbcdb41786229f51ec0994ff67 linphone-0.12.2.tar.gz +d65f977dd6512b7725fcb2e2c9713e65 linphone-1.0.1.tar.gz