Hello community, here is the log from the commit of package coriander checked in at Thu Aug 17 18:13:25 CEST 2006. -------- --- GNOME/coriander/coriander.changes 2006-03-31 15:38:46.000000000 +0200 +++ coriander/coriander.changes 2006-08-17 18:13:08.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 16 18:44:35 CEST 2006 - olh@suse.de + +- update to 2.0.0-rc1 (#198102) + - many optimizations and bugfixes + - compiles with current 1394 libraries + - build with ffmpeg support + +------------------------------------------------------------------- Old: ---- coriander-1.0.1.tar.bz2 coriander.configure.patch coriander.warnings.patch New: ---- coriander-2.0.0-rc1.tar.bz2 coriander.ffmpeg-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coriander.spec ++++++ --- /var/tmp/diff_new_pack.tRrMg8/_old 2006-08-17 18:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.tRrMg8/_new 2006-08-17 18:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package coriander (Version 1.0.1) +# spec file for package coriander (Version 2.0.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,20 +11,19 @@ # norootforbuild Name: coriander -BuildRequires: SDL-devel db1-devel esound-devel gdk-pixbuf-devel gnome-libs-devel gnutls-devel imlib-config libdc1394-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel update-desktop-files +BuildRequires: SDL-devel ffmpeg-devel gcc-c++ libgnomeui-devel libstdc++-devel update-desktop-files License: GPL Group: Hardware/Other Autoreqprov: on -Version: 1.0.1 -Release: 17 +Version: 2.0.0 +Release: 1 Summary: GNOME IEEE-1394 Digital Camera Controller BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.tele.ucl.ac.be/PEOPLE/DOUXCHAMPS/ieee1394/coriander/ -Source: http://prdownloads.sourceforge.net/coriander/%{name}-%{version}.tar.bz2 +Source: http://prdownloads.sourceforge.net/coriander/%{name}-%{version}-rc1.tar.bz2 Source1: %{name}.desktop Source2: http://prdownloads.sourceforge.net/sourceforge/coriander/coriander-doc-0.1.0... -Patch0: coriander.configure.patch -Patch1: coriander.warnings.patch +Patch2: coriander.ffmpeg-config.patch %description Coriander is a GUI for controlling a digital camera (in the sense of @@ -43,15 +42,11 @@ Dan Dennedy <dan at dennedy dot org> %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup -q -n coriander-2.0.0-rc1 +%patch2 -p1 %build -%{?suse_update_config:%{suse_update_config -f} } -%{__aclocal} -I /opt/gnome/share/aclocal -I macros -%{__autoconf} -%{__automake} -a +autoreconf -fi PATH=/opt/gnome/bin:$PATH \ CFLGAS="${RPM_OPT_FLAGS}" ./configure --prefix=/opt/gnome echo "#undef MMX_SUPPORT" >> config.h @@ -60,7 +55,7 @@ %{__make} %{?jobs:-j%jobs} %install -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install mkdir -p \ ${RPM_BUILD_ROOT}/opt/gnome/share/applications/ \ @@ -69,9 +64,6 @@ cp -a %{S:2} . %suse_update_desktop_file coriander AudioVideo AudioVideoEditing -%clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO coriander-doc-0.1.0.pdf @@ -80,6 +72,11 @@ /opt/gnome/share/pixmaps/coriander %changelog -n coriander +* Wed Aug 16 2006 - olh@suse.de +- update to 2.0.0-rc1 (#198102) +- many optimizations and bugfixes +- compiles with current 1394 libraries +- build with ffmpeg support * Fri Mar 31 2006 - olh@suse.de - add gnome-libs-devel to BuildRequires (#161918) * Thu Mar 09 2006 - bk@suse.de ++++++ coriander.ffmpeg-config.patch ++++++ --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: coriander-2.0.0-rc1/configure.in =================================================================== --- coriander-2.0.0-rc1.orig/configure.in +++ coriander-2.0.0-rc1/configure.in @@ -317,7 +317,7 @@ AC_DEFUN([AC_CHECK_LFS],[ AC_DEFUN([AC_CHECK_FFMPEG],[ AC_SUBST(FFMPEG_CFLAGS) AC_SUBST(FFMPEG_LIBS) - AC_CHECK_PROG(have_ffmpeg_config, ffmpeg-config, "found", "no") + AC_CHECK_PROG(have_ffmpeg_config, pkg-config --libs libavformat libavcodec, "found", "no") if test x$have_ffmpeg_config = xfound; then AC_MSG_CHECKING(ffmpeg version) AC_TRY_COMPILE([ @@ -334,8 +334,8 @@ AC_DEFUN([AC_CHECK_FFMPEG],[ ],ffmpeg=ok,ffmpeg=outdated); AC_MSG_RESULT($ffmpeg) if test x$ffmpeg = xok; then - FFMPEG_LIBS=`ffmpeg-config --libs avformat avcodec` - FFMPEG_CFLAGS=`ffmpeg-config --cflags` + FFMPEG_LIBS=`pkg-config --libs libavformat libavcodec` + FFMPEG_CFLAGS=`pkg-config --cflags libavformat libavcodec` AC_DEFINE(HAVE_FFMPEG,1,[defined if ffmpeg is available]) else AC_ERROR([ffmpeg is too old. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org