[SVN] r2999 - in trunk/rpms: . galeon linphone

svn-commits at rpmforge.net svn-commits at rpmforge.net
Sun Mar 13 06:43:56 CET 2005


Author: dag
Date: 2005-03-13 06:43:55 +0100 (Sun, 13 Mar 2005)
New Revision: 2999

Added:
   trunk/rpms/linphone/
   trunk/rpms/linphone/linphone-0.12.2-docs.patch
   trunk/rpms/linphone/linphone-0.12.2-speex.patch
   trunk/rpms/linphone/linphone.spec
Modified:
   trunk/rpms/galeon/galeon.spec
Log:
Updates

Modified: trunk/rpms/galeon/galeon.spec
===================================================================
--- trunk/rpms/galeon/galeon.spec	2005-03-13 02:43:16 UTC (rev 2998)
+++ trunk/rpms/galeon/galeon.spec	2005-03-13 05:43:55 UTC (rev 2999)
@@ -7,7 +7,7 @@
 
 Summary: GNOME browser based on Gecko (Mozilla rendering engine)
 Name: galeon
-Version: 1.3.19
+Version: 1.3.20
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -31,28 +31,10 @@
 %prep
 %setup
 
-%{__cat} <<'EOF' >galeon.sh
-#!/bin/sh
-
-### Written by Dag Wieers <dag at wieers.com>
-### Please send suggestions and fixes to me.
-
-if [ -z "$MOZILLA_FIVE_HOME" ]; then
-	MOZILLA_FIVE_HOME="%{_libdir}/mozilla-%{lversion}"
-fi
-
-LD_LIBRARY_PATH="$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH"
-
-export LD_LIBRARY_PATH MOZILLA_FIVE_HOME
-
-exec %{_libdir}/galeon/galeon $@
-EOF
-
 %build
 %configure \
 	--disable-werror \
-	--disable-schemas-install \
-	--with-mozilla-snapshot="1.7.2"
+	--disable-schemas-install
 %{__make} %{?_smp_mflags}
 
 %install
@@ -61,9 +43,6 @@
 %makeinstall
 %find_lang %{name}-2.0
 
-#%{__mv} -f %{buildroot}%{_bindir}/galeon %{buildroot}%{_libdir}/galeon/galeon
-#%{__install} -D -m0755 galeon.sh %{buildroot}%{_bindir}/galeon
-
 %{__install} -d -m0755 %{buildroot}%{_libdir}/mozilla/plugins/
 
 %post
@@ -98,6 +77,9 @@
 %exclude %{_localstatedir}/scrollkeeper/
 
 %changelog
+* Sun Mar 13 2005 Dag Wieers <dag at wieers.com> - 1.3.20-1
+- Updated to release 1.3.20.
+
 * Sun Jan 16 2005 Dag Wieers <dag at wieers.com> - 1.3.19-1
 - Updated to release 1.3.19.
 

Added: trunk/rpms/linphone/linphone-0.12.2-docs.patch
===================================================================
--- trunk/rpms/linphone/linphone-0.12.2-docs.patch	2005-03-13 02:43:16 UTC (rev 2998)
+++ trunk/rpms/linphone/linphone-0.12.2-docs.patch	2005-03-13 05:43:55 UTC (rev 2999)
@@ -0,0 +1,56 @@
+--- 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

Added: trunk/rpms/linphone/linphone-0.12.2-speex.patch
===================================================================
--- trunk/rpms/linphone/linphone-0.12.2-speex.patch	2005-03-13 02:43:16 UTC (rev 2998)
+++ trunk/rpms/linphone/linphone-0.12.2-speex.patch	2005-03-13 05:43:55 UTC (rev 2999)
@@ -0,0 +1,16 @@
+--- 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
+ 

Added: trunk/rpms/linphone/linphone.spec
===================================================================
--- trunk/rpms/linphone/linphone.spec	2005-03-13 02:43:16 UTC (rev 2998)
+++ trunk/rpms/linphone/linphone.spec	2005-03-13 05:43:55 UTC (rev 2999)
@@ -0,0 +1,115 @@
+# $Id$
+# Authority: dag
+# Upstream: Simon Morlat <simon.morlat$linphone,org>
+
+%{?fc1:%define _without_alsa 1}
+%{?fc1:%define _without_gnome_applet 1}
+%{?el3:%define _without_alsa 1}
+%{?el3:%define _without_gnome_applet 1}
+%{?rh9:%define _without_alsa 1}
+%{?rh9:%define _without_gnome_applet 1}
+%{?rh7:%define _without_alsa 1}
+%{?rh7:%define _without_gnome_applet 1}
+%{?el2:%define _without_alsa 1}
+%{?el2:%define _without_gnome_applet 1}
+
+%define desktop_vendor rpmforge
+
+Summary: Software Internet phone using SIP
+Name: linphone
+Version: 0.12.2
+Release: 1
+License: GPL
+Group: Applications/Communications
+URL: http://www.linphone.org/
+
+Source: http://simon.morlat.free.fr/download/%{version}/source/linphone-%{version}.tar.gz
+Patch: linphone-0.12.2-speex.patch
+Patch1: linphone-0.12.2-docs.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gettext, glib2-devel, libgnomeui-devel
+BuildRequires: libosip-devel, speex-devel
+%{!?_without_alsa:BuildRequires: alsa-lib-devel}
+%{!?_without_gnome_applet:BuildRequires: gnome-panel-devel}
+Requires: /sbin/ldconfig
+
+%description
+Linphone is a web phone: it let you phone to your friends anywhere in
+the world, freely, simply by using the internet. The cost of the phone
+call is the cost that you spend connected to the internet.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup
+%patch -p1 -b .speex
+%patch1 -p1 -b .docs
+
+%{__rm} -rf speex/ oRTP/docs/
+
+%{__perl} -pi.orig -e 's|\$\(prefix\)/lib|\$(libdir)|g' share/Makefile.in
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+desktop-file-install \
+	--delete-original                          \
+	--vendor %{desktop_vendor}                 \
+	--add-category X-Red-Hat-Base              \
+	--dir %{buildroot}%{_datadir}/applications \
+	%{buildroot}%{_datadir}/gnome/apps/Internet/linphone.desktop
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post
+/sbin/ldconfig 2>/dev/null
+
+%postun
+/sbin/ldconfig 2>/dev/null
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
+%doc %{_mandir}/man1/*
+%doc %{_datadir}/gnome/help/linphone/
+%doc %{_datadir}/gtk-doc/html/mediastreamer/
+%{_bindir}/*
+%{_libdir}/bonobo/servers/GNOME_LinphoneApplet.server
+%{_libdir}/*.so.*
+%{_libexecdir}/linphone_applet
+%{_datadir}/applications/%{desktop_vendor}-linphone.desktop
+%{_datadir}/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+%{_datadir}/linphonec/
+%{_datadir}/pixmaps/linphone/
+%{_datadir}/sounds/linphone/
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/linphone/
+%{_includedir}/ortp/
+%{_includedir}/osipua/
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/linphone.pc
+
+%changelog
+* Sun Mar 13 2005 Dag Wieers <dag at wieers.com> - 0.12.2-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/linphone/linphone.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native




More information about the commits mailing list