* Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2

- Don't run autotools during build.

.cvsignore

@@ -1 +1,2 @@
 xine-lib-1.1.3-pruned.tar.bz2
+xine-lib-1.1.3-autotools.patch.bz2

sources

@@ -1 +1,2 @@
 eff682745f198e1881773509f12c70c3  xine-lib-1.1.3-pruned.tar.bz2
+a58fce450d9288224caa413ad8bc1f8d  xine-lib-1.1.3-autotools.patch.bz2

xine-lib-1.1.1-configure-no-mcpu-march.patch

@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
-                   ;;
- 
-               esac
--              if test x"$archopt_val" != x; then
--                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--              fi
-             fi
-           else
-             dnl we have the Intel compiler

xine-lib-1.1.3-optflags.patch

@@ -0,0 +1,22 @@
+--- xine-lib-1.1.3/m4/optimizations.m4~	2006-06-17 18:20:56.000000000 +0300
++++ xine-lib-1.1.3/m4/optimizations.m4	2006-12-17 11:49:44.000000000 +0200
+@@ -107,7 +107,7 @@
+ 
+             DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+ 
+-            if test x"$sarchopt" != "xno"; then
++            if false ; then
+               archopt_val=
+ 
+               case "$host_or_hostalias" in
+--- xine-lib-1.1.3/configure~	2006-12-03 21:41:27.000000000 +0200
++++ xine-lib-1.1.3/configure	2006-12-17 11:50:07.000000000 +0200
+@@ -46971,7 +46971,7 @@
+ 
+             DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+ 
+-            if test x"$sarchopt" != "xno"; then
++            if false ; then
+               archopt_val=
+ 
+               case "$host_or_hostalias" in

xine-lib.spec

@@ -7,19 +7,25 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
 #Source0:        http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz
-Source0:        xine-lib-%{version}-pruned.tar.bz2
+Source0:        %{name}-%{version}-pruned.tar.bz2
-Source1:        xine-lib-cleanup-sources.sh
+Source1:        %{name}-cleanup-sources.sh
-Patch1:         xine-lib-1.1.1-configure-no-mcpu-march.patch
+# To recreate the autotools patch: install build deps, extract source0,
-Patch6:         xine-lib-1.1.1-deepbind-939.patch
+# remove run_configure "$@" from autogen.sh, copy the dir to -patched,
-Patch7:         xine-lib-1.1.1-multilib-devel.patch
+# run autogen.sh (doesn't work with automake 1.10 as of 1.1.3 so use 1.9),
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# remove autom4te.cache, then diff the dirs.  Apply rest of the patches during
+# build so that autotools do not need to be run again.
+Patch0:         %{name}-1.1.3-autotools.patch.bz2
+Patch1:         %{name}-1.1.3-optflags.patch
+Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.1-multilib-devel.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
 BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
 # Video
@@ -41,8 +47,7 @@ BuildRequires:  jack-audio-connection-kit-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
-BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
+BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel samba-common
-BuildRequires:  libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common
 
 %package devel
 Summary:         Xine library development files
@@ -93,19 +98,16 @@ This package contains extra plugins for xine-lib:
 
 %prep
 %setup -q
-%patch1 -p0 -b .nomcpu
+%patch0 -p1 -b .autotools
+cp -p m4/optimizations.m4 m4/optimizations.m4.stamp
+%patch1 -p1 -b .optflags
+touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
 
 find . -name "*.[hc]" | xargs chmod -c -x
 
-aclocal-1.9 -I m4
-libtoolize --force
-autoheader
-automake-1.9 --gnu --add-missing
-autoconf
-
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -275,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2
+- Don't run autotools during build.
+
 * Mon Dec 04 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.1.3-1
 - version 1.1.3
 - patch2 applied upstream