sustaining/oi_151a/spec-files: comparison ekiga.spec

equal deleted inserted replaced

-:5d3b30e5e190
+:ba94a0d2c6ae
 # package are under the same license as the package itself.
 #
 Name:		ekiga
 License:	GPL
 Group:		X11/GNOME/Applications
-Version:	2.0
+Version:        2.0.2
+%define libsdl_version 1.2.9
+%define pwlib_version 1.10.1
+%define opal_version 2.2.2
 Release:	1
 Vendor:		Sun Microsystems, Inc.
 Distribution:	Java Desktop System
 Summary:	A GNOME based H.323/SIP video conferencing application
-Source0:	http://snapshots.seconix.com/cvs/%{name}-cvs.tar.gz
+Source0:        http://www.ekiga.org/admin/downloads/latest/sources/sources/ekiga-%{version}.tar.gz
-Source1:	http://snapshots.seconix.com/cvs/pwlib-cvs.tar.gz
+Source1:        http://www.ekiga.org/admin/downloads/latest/sources/sources/opal-%{opal_version}.tar.gz
-Source2:	http://snapshots.seconix.com/cvs/opal-cvs.tar.gz
+Source2:        http://www.ekiga.org/admin/downloads/latest/sources/sources/pwlib-%{pwlib_version}.tar.gz
-Source3:	http://www.libsdl.org/release/SDL-1.2.9.tar.gz
+Source3:        http://www.libsdl.org/release/SDL-%{libsdl_version}.tar.gz
 Patch1:         ekiga-01-pwlib-cxxflags.diff
 Patch2:         ekiga-02-pwlib-name.diff
 Patch3:         ekiga-03-pwlib-plugindir.diff
 Patch4:         ekiga-04-opal-name.diff
-Patch5:         ekiga-05-multi-decla.diff
 Patch6:         ekiga-06-menu-entry.diff
+Patch7:         ekiga-07-autogen.diff
 URL:		http://www.gnomemeeting.org
 BuildRoot:	%{_tmppath}/%{name}-root
 Docdir:       	%{_docdir}/%{name}
 Autoreqprov:  	on
-%define libsdl_version 1.2.9
+# The following version definitions probably are out of date, need update
-%define pwlib_version 1.11.0
-%define opal_version 2.3.0
 %define GConf_version 2.4.0.1
 %define gtk2_version 2.3.1
 %define openldap2_devel_version 2.1.4
 %define intltool_version 0.27
 %define libgnomeui_version 2.4.0.1
 the Internet. Ekiga is the first Open Source application to support
 both H.323 and SIP, as well as audio and video. Ekiga was formerly known
 as GnomeMeeting.
 %prep
-%setup -q -b 1 -b 2 -b 3 -n %{name}
+%setup -q -b 1 -b 2 -b 3 -n %{name}*
 # patch for pwlib
-cd ../pwlib
+cd ../pwlib*
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 # patch for opal
-cd ../opal
+cd ../opal*
 %patch4 -p1
 # patch for ekiga
-cd ../ekiga
+cd ../ekiga*
-%patch5 -p1
 %patch6 -p1
+%patch7 -p1
+chmod +x autogen.sh
 %build
 %ifos linux
 if [ -x /usr/bin/getconf ]; then
 CPUS=`getconf _NPROCESSORS_ONLN`
 --datadir=%{_datadir} \
 --includedir=%{_includedir} \
 --mandir=%{_mandir}
 make -j $CPUS
-cd ..
+cd include
+# so that SDL/*.h can be found
+rm -f SDL; ln -s . SDL
+cd ../..
 export MYDIR=`pwd`
 # build pwlib
-cd pwlib
+cd pwlib*
 # symlink the make dir to bin so that ptlib-config is found by ekiga
 ln -s make bin
 #FIXME
 # set RPM_OPT_FLAGS to null since pwlib messly uses
 # STDCCFLAGS for both CC and CXX, which picks up the
 RPM_OPT_FLAGS=""
 PWLIBDIR=`pwd`
 export RPM_OPT_FLAGS PWLIBDIR
 autoconf
 export CFLAGS="$CFLAGS -I${MYDIR}/SDL-%{libsdl_version}/include"
+export CXXFLAGS="$CXXFLAGS -I${MYDIR}/SDL-%{libsdl_version}/include"
 export LDFLAGS="$LDFLAGS -L${MYDIR}/SDL-%{libsdl_version}/src/.libs"
 ./configure --prefix=%{_prefix} \
 --libdir=%{_libdir}/%{name} \
 --bindir=%{_bindir} \
 --datadir=%{_datadir} \
 # set original RPM_OPT_FLAGS back
 RPM_OPT_FLAGS=$RPM_OPT_FLAGS_SAVE
 export RPM_OPT_FLAGS
 # build opal
-cd ../opal
+cd ../opal*
 ./configure --prefix=%{_prefix} \
 --libdir=%{_libdir}/%{name} \
 --bindir=%{_bindir} \
 --datadir=%{_datadir} \
 --includedir=%{_includedir} \
 --mandir=%{_mandir} \
 	    --enable-localspeex
 make -j $CPUS
 # build ekiga
-cd ../%{name}
+cd ../%{name}*
 # so that SDL/include can be found
 rm -f SDL; ln -s ../SDL-%{libsdl_version} SDL
 ACLOCAL_FLAGS="$ACLOCAL_FLAG -I SDL"
 SDL_CONFIG=${MYDIR}/SDL-%{libsdl_version}/sdl-config
 export SDL_CONFIG ACLOCAL_FLAGS
 --bindir=%{_bindir} \
 --datadir=%{_datadir} \
 --includedir=%{_includedir} \
 --mandir=%{_mandir} \
 	     --sysconfdir=%{_sysconfdir} \
-	     --with-pwlib-dir=${MYDIR}/pwlib \
+	     --with-pwlib-dir=${MYDIR}/pwlib-%{pwlib_version} \
-	     --with-opal-dir=${MYDIR}/opal \
+	     --with-opal-dir=${MYDIR}/opal-%{opal_version} \
 	     --with-sdl-prefix=${MYDIR}/SDL-%{libsdl_version} \
 	     --disable-avahi \
 	     --disable-scrollkeeper
 make -j $CPUS LIBS=-lX11
 %install
 cd ../SDL-%{libsdl_version}
 make install DESTDIR=$RPM_BUILD_ROOT
-cd ../pwlib
+cd ../pwlib*
 make install DESTDIR=$RPM_BUILD_ROOT
-cd ../opal
+cd ../opal*
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_bindir}
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*a
+cd ../%{name}*
-cd ../%name
 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f  $RPM_BUILD_ROOT%{_bindir}/*config*
+rm -f  $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*a
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/bonobo $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 %post
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %changelog
+* Mon Jul 10 2006 - [email protected]
+- change to use Ekiga 2.0.2 release
 * Fri Jun 16 2006 - [email protected]
 - add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 to make sure not
 install the directory based %gconf.xml files based on the
 instruction in gconf.txt

changeset 7598	ba94a0d2c6ae
parent 7527	ac917ecf3f26
child 7873	b10ff9d93b30