rpms/ekiga/devel ekiga-fix-desktop-in.patch, NONE, 1.1 ekiga.spec, 1.64, 1.65 ekiga-fixlibnotify.patch, 1.1, NONE

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29563

Modified Files:
	ekiga.spec 
Added Files:
	ekiga-fix-desktop-in.patch 
Removed Files:
	ekiga-fixlibnotify.patch 
Log Message:
- Proper fix from upstream for desktop file

ekiga-fix-desktop-in.patch:

--- NEW FILE ekiga-fix-desktop-in.patch ---
--- trunk/Makefile.am	2009/01/05 19:55:14	7522
+++ trunk/Makefile.am	2009/01/06 21:08:47	7529
@@ -12,7 +12,6 @@
 
 DESKTOP_IN_FILE=@PACKAGE_NAME at .desktop.in.in
 DESKTOP_FILE=@PACKAGE_NAME at .desktop
-DESKTOP_FILES=$(DESKTOP_IN_FILE:.desktop.in=.desktop)
 
 SCHEMAS_IN_IN_FILE = @PACKAGE_NAME at .schemas.in.in
 SCHEMAS_FILE = @PACKAGE_NAME at .schemas
@@ -61,7 +60,7 @@
 	$(WIN32_DIST)
 
 Applicationsdir = $(datadir)/applications
-Applications_DATA = $(DESKTOP_FILES)
+Applications_DATA = $(DESKTOP_FILE)
 
 
 ### Dist Clear


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ekiga.spec	7 Jan 2009 07:02:38 -0000	1.64
+++ ekiga.spec	13 Jan 2009 06:55:20 -0000	1.65
@@ -1,10 +1,10 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
-Source1:	ekiga.desktop
+Patch0:		ekiga-fix-desktop-in.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-desktop-in
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
@@ -63,10 +64,6 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-# Temporarily remove the desktop.in.in file and replace with the real thing
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop.in.in
-cp %{SOURCE1}  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
-
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
@@ -138,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-3
+- Proper fix from upstream for desktop file
+
 * Wed Jan  7 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-2
 - Fix issues with the desktop file
 


--- ekiga-fixlibnotify.patch DELETED ---