From 4e33712879a61e914700c3ca89e96d79972973271424198f7c6d0a8ddd355f28 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 25 Jun 2008 23:00:28 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=9

---
 xine-configure.diff | 10 ++++++++++
 xine-lib.changes    |  5 +++++
 xine-lib.spec       | 12 ++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 xine-configure.diff

diff --git a/xine-configure.diff b/xine-configure.diff
new file mode 100644
index 0000000..f0647ca
--- /dev/null
+++ b/xine-configure.diff
@@ -0,0 +1,10 @@
+--- xine-lib-1.1.12/configure.ac
++++ xine-lib-1.1.12/configure.ac
+@@ -118,6 +118,7 @@ dnl Check for programs.
+ dnl ---------------------------------------------
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_AS
+ 
+ case "$host_os" in
diff --git a/xine-lib.changes b/xine-lib.changes
index 815a7f9..3b99dfd 100644
--- a/xine-lib.changes
+++ b/xine-lib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 19 11:15:33 CEST 2008 - schwab@suse.de
+
+- Remove local libtool macros and run autoreconf.
+
 -------------------------------------------------------------------
 Wed May 14 16:26:18 CEST 2008 - mhopf@suse.de
 
diff --git a/xine-lib.spec b/xine-lib.spec
index 65d0be1..711b2ee 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -34,7 +34,7 @@ BuildRequires:  mad-devel
 %endif
 Recommends:     opensuse-codecs-installer
 Version:        1.1.12
-Release:        1
+Release:        11
 %define abiversion 1.21
 Summary:        Video Player with Plug-Ins
 Group:          Productivity/Multimedia/Video/Players
@@ -62,6 +62,7 @@ Patch70:        xine-lib-crippled-LOCAL.diff
 Patch71:        xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff
 Patch72:        xine-lib-1.1.7-install-plugins-helper.diff
 Patch73:        xine-lib-assert.patch
+Patch74:        xine-configure.diff
 # *** Only working for noncrippled source
 Patch80:        xine-lib-various-noncrippled.diff
 
@@ -184,17 +185,18 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/
 %patch72 -p1
 %patch73 -p1
 %patch28 -p1
+%patch74 -p1
+rm -f m4/libtool15.m4
 
 %build
 cd xine-lib-%version
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-force-addr"
 export CCASFLAGS=-Wa,--noexecstack
-# ignore nonupdated automake+co files
-rm -f missing ; touch missing
 %if 0%suse_version < 1011
 echo 'AC_DEFUN([AC_REQUIRE_AUX_FILE])dnl' >> acinclude.m4
 %endif
-./autogen.sh --prefix=/usr \
+AUTOPOINT=true autoreconf -fi
+./configure --prefix=/usr \
 	--libdir=%_libdir \
 	--mandir=%_mandir \
 %if 0%suse_version > 1010
@@ -448,6 +450,8 @@ echo "/usr/share/xine/mad" >> files.internal
 %endif
 
 %changelog
+* Thu Jun 19 2008 schwab@suse.de
+- Remove local libtool macros and run autoreconf.
 * Wed May 14 2008 mhopf@suse.de
 - Update to 1.1.12:  (fixes bnc#379499)
   * Fixed and improved the PulseAudio driver.