diff --git a/.cvsignore b/.cvsignore index ea459c9..eef94d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ ekiga-3.1.0.tar.bz2 -ekiga.desktop diff --git a/ekiga.spec b/ekiga.spec index 56b1fbe..3f34e5b 100644 --- a/ekiga.spec +++ b/ekiga.spec @@ -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: expat-devel 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 @@ It uses the standard SIP and H323 protocols. %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 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 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 @@ scrollkeeper-update -q || : %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Thu Jan 15 2009 Peter Robinson - 3.1.0-8 +- Regen Makefile.in using autoreconf due to patch + * Wed Jan 14 2009 Peter Robinson - 3.1.0-7 - Another fix diff --git a/sources b/sources index 00facea..e45691b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ ec8690ff84b364d2df5b2443a01ba529 ekiga-3.1.0.tar.bz2 -d13f57c9df3344a90697d88490adbf20 ekiga.desktop