rpms/ekiga/devel .cvsignore, 1.17, 1.18 ekiga.spec, 1.69, 1.70 sources, 1.19, 1.20

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Regen Makefile.in using autoreconf due to patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Jan 2009 08:56:53 -0000	1.17
+++ .cvsignore	15 Jan 2009 08:53:05 -0000	1.18
@@ -1,2 +1 @@
 ekiga-3.1.0.tar.bz2
-ekiga.desktop


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ekiga.spec	14 Jan 2009 08:56:53 -0000	1.69
+++ ekiga.spec	15 Jan 2009 08:53:05 -0000	1.70
@@ -1,10 +1,9 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
-Source1:	ekiga.desktop
 Patch0:		ekiga-fix-desktop-in.patch
 License:	GPLv2+
 Group:		Applications/Communications
@@ -38,6 +37,8 @@
 BuildRequires:	SDL-devel
 #BuildRequires:	gstreamer-devel
 #BuildRequires:	gstreamer-plugins-base-devel
+#Temp until the next beta
+BuildRequires:	autoconf
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -54,6 +55,7 @@
 %patch0 -p1 -b .fix-desktop-in
 
 %build
+autoreconf
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
 %configure --disable-scrollkeeper --enable-xcap
 make %{?_smp_mflags}
@@ -66,10 +68,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}
@@ -141,6 +139,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Jan 15 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-8
+- Regen Makefile.in using autoreconf due to patch
+
 * Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-7
 - Another fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Jan 2009 08:56:53 -0000	1.19
+++ sources	15 Jan 2009 08:53:05 -0000	1.20
@@ -1,2 +1 @@
 ec8690ff84b364d2df5b2443a01ba529  ekiga-3.1.0.tar.bz2
-d13f57c9df3344a90697d88490adbf20  ekiga.desktop