--- a/ChangeLog	Tue Apr 13 15:37:14 2010 +0000
+++ b/ChangeLog	Wed Apr 14 00:14:13 2010 +0000
@@ -1,3 +1,11 @@
+2010-04-13  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-media.spec, base-specs/gst.spec, 
+	  base-specs/gst-plugins-base.spec, base-specs/gst-plugins-good.spec,
+	  patches/gst-plugins-base-02-makefile.diff,
+	  patches/gst-plugins-good-11-makefile.diff:  Now build GStreamer for
+	  amd64 as well.  Add patches needed to build.  Fixes bug #15252.
+
 2010-04-13  Michal Pryc <[email protected]>
 
 	* gnome-applets-08-invest-gconf.diff: Added, fixes
@@ -6,7 +14,7 @@
 2010-04-13  Padraig O'Briain  <[email protected]>
 
 	* SUNWgnome-file-mgr.spec: Remove building of eel to fix d.o.o. 15000
-        * base-specs/nautilus.spec, base-specs/nautilus-open-terminal.spec:
+	* base-specs/nautilus.spec, base-specs/nautilus-open-terminal.spec:
 	  Remove references to eel.
 
 2010-04-12  Christian Kelly  <[email protected]>

--- a/SUNWgnome-media.spec	Tue Apr 13 15:37:14 2010 +0000
+++ b/SUNWgnome-media.spec	Wed Apr 14 00:14:13 2010 +0000
@@ -13,6 +13,14 @@
 
 %define with_hal %(pkginfo -q SUNWhal && echo 1 || echo 0)
 
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use gst64 = gst.spec
+%use gst_plugins_base64 = gst-plugins-base.spec
+%use gst_plugins_good64 = gst-plugins-good.spec
+%endif
+
+%include base.inc
 %use gst = gst.spec
 %use gst_plugins_base = gst-plugins-base.spec
 %use gst_plugins_good = gst-plugins-good.spec
@@ -39,14 +47,14 @@
 BuildRequires: SUNWlibtheora-devel
 BuildRequires: SUNWogg-vorbis-devel
 BuildRequires: SUNWPython-extra
-BuildRequires: SUNWliboil-devel
+#BuildRequires: SUNWliboil-devel
 BuildRequires: SUNWgnome-audio-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWjpg-devel
 BuildRequires: SUNWpng-devel
 BuildRequires: SUNWlibsoup-devel
-BuildRequires: SUNWlibvisual-devel
+#BuildRequires: SUNWlibvisual-devel
 BuildRequires: SUNWaalib
 Requires: SUNWgtk2
 Requires: SUNWgnome-libs
@@ -59,7 +67,7 @@
 Requires: SUNWflac
 Requires: SUNWlibtheora
 Requires: SUNWogg-vorbis
-Requires: SUNWliboil
+#Requires: SUNWliboil
 Requires: SUNWlibms
 Requires: SUNWgnome-audio
 Requires: SUNWgnome-config
@@ -72,7 +80,7 @@
 Requires: SUNWpng
 Requires: SUNWxorg-clientlibs
 Requires: SUNWzlib
-Requires: SUNWlibvisual
+#Requires: SUNWlibvisual
 Requires: SUNWdesktop-cache
 Requires: SUNWaalib
 %if %with_hal
@@ -100,9 +108,19 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-%gst.prep -d %name-%version
-%gst_plugins_base.prep -d %name-%version
-%gst_plugins_good.prep -d %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%gst64.prep -d %name-%version/%_arch64
+%gst_plugins_base64.prep -d %name-%version/%_arch64
+%gst_plugins_good64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%{base_arch}
+%gst.prep -d %name-%version/%{base_arch}
+%gst_plugins_base.prep -d %name-%version/%{base_arch}
+%gst_plugins_good.prep -d %name-%version/%{base_arch}
+
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
@@ -113,30 +131,65 @@
 export echo="/usr/bin/echo"
 export RM="/usr/bin/rm"
 
-# Note that including  __STDC_VERSION n CFLAGS for gnome-media breaks the S9
-# build for gstreamer,  gst-plugins, and gnome-media, so not including for them.
-#
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+
+%ifarch amd64 sparcv9
+export CFLAGS="%optflags64 -I/usr/sfw/include -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="$FLAG64"
+export PKG_CONFIG_PATH="/usr/lib/%{_arch64}/pkgconfig:%{_pkg_config_path}"
 
-%gst.build -d %name-%version
+%gst64.build -d %name-%version/%_arch64
 
 # Need /usr/X11/lib and /usr/X11/include to gain access to libXv.so
 # needed for xvimagesink.
 #
-export PKG_CONFIG_PATH=%{_builddir}/%name-%version/gstreamer-%{gst.version}/pkgconfig:%{_pkg_config_path}
+export CFLAGS="%optflags64 -I/usr/sfw/include -I/usr/X11/include -DANSICPP"
+export LDFLAGS="$FLAG64 -L/usr/X11/lib/amd64 -R/usr/X11/lib/amd64 -lresolv"
+export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{_arch64}/gstreamer-%{gst.version}/pkgconfig:/usr/lib/%{_arch64}/pkgconfig:%{_pkg_config_path}"
+
+# Need to disable building with these libraries since there is no 64-bit
+# version available yet.
+#
+export GST_EXTRA_CONFIG="--disable-gnome_vfs"
+
+%gst_plugins_base64.build -d %name-%version/%_arch64
+
+export CFLAGS="%optflags64 -I/usr/sfw/include -DANSICPP"
+export LDFLAGS="$FLAG64 -L/usr/X11/lib/amd64 -R/usr/X11/lib/amd64"
+export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{_arch64}/gstreamer-%{gst.version}/pkgconfig:%{_builddir}/%name-%version/%{_arch64}/gst-plugins-base-%{gst_plugins_base.version}/pkgconfig:/usr/lib/%{_arch64}/pkgconfig:%{_pkg_config_path}"
+
+# Need to disable building with these libraries since there is no 64-bit
+# version available yet.
+#
+export GST_EXTRA_CONFIG="--disable-soup"
+
+%gst_plugins_good64.build -d %name-%version/%_arch64
+
+export GST_EXTRA_CONIFG=""
+%endif
+
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export RPM_OPT_FLAGS="$CFLAGS"
+export LDFLAGS="%_ldflags"
+export PKG_CONFIG_PATH="%{_pkg_config_path}"
+
+%gst.build -d %name-%version/%{base_arch}
+
+# Need /usr/X11/lib and /usr/X11/include to gain access to libXv.so
+# needed for xvimagesink.
+#
 export CFLAGS="%optflags -I/usr/sfw/include -I/usr/X11/include -DANSICPP"
 export LDFLAGS="%_ldflags -L/usr/X11/lib -R/usr/X11/lib -lresolv"
+export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{base_arch}/gstreamer-%{gst.version}/pkgconfig:%{_pkg_config_path}"
 
-%gst_plugins_base.build -d %name-%version
+%gst_plugins_base.build -d %name-%version/%{base_arch}
 
-export PKG_CONFIG_PATH=%{_builddir}/%name-%version/gstreamer-%{gst.version}/pkgconfig:%{_pkg_config_path}:%{_builddir}/%name-%version/gst-plugins-base-%{gst_plugins_base.version}/pkgconfig:%{_pkg_config_path}
 export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
 export LDFLAGS="%_ldflags"
+export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{base_arch}/gstreamer-%{gst.version}/pkgconfig:%{_builddir}/%name-%version/%{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/pkgconfig:%{_pkg_config_path}"
 
-%gst_plugins_good.build -d %name-%version
+%gst_plugins_good.build -d %name-%version/%{base_arch}
 
 %install
 # There seems to be an issue with the version of libtool that GStreamer is
@@ -147,9 +200,36 @@
 
 rm -rf $RPM_BUILD_ROOT
 
-%gst.install -d %name-%version
-%gst_plugins_base.install -d %name-%version
-%gst_plugins_good.install -d %name-%version
+%ifarch amd64 sparcv9
+# Rebuilding the gobject-introspection files requires resetting.
+export CFLAGS="%optflags64 -DANSICPP"
+export LDFLAGS="$FLAG64"
+
+%gst64.install -d %name-%version/%_arch64
+%gst_plugins_base64.install -d %name-%version/%_arch64
+%gst_plugins_good64.install -d %name-%version/%_arch64
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/gstreamer-%{gst_minmaj}/tools
+cd $RPM_BUILD_ROOT%{_bindir}/%{_arch64}
+for prog in gst-feedback gst-inspect gst-launch gst-typefind \
+            gst-xmlinspect gst-xmllaunch; do
+  mv $prog-%{gst_minmaj} ../../lib/%{_arch64}/gstreamer-%{gst_minmaj}/tools
+  rm -f $prog
+  ln -s ../../lib/%{_arch64}/gstreamer-%{gst_minmaj}/tools/$prog-%{gst_minmaj} $prog
+done
+
+perl -pi -e 's,^toolsdir=.*,toolsdir=\${exec_prefix}/%{_arch64}/lib/gstreamer-%{gst_minmaj}/tools,' $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/pkgconfig/gstreamer-%{gst_minmaj}.pc
+%endif
+
+cd %{_builddir}
+
+# Rebuilding the gobject-introspection files requires resetting.
+export CFLAGS="%optflags -DANSICPP"
+export LDFLAGS="%_ldflags"
+
+%gst.install -d %name-%version/%{base_arch}
+%gst_plugins_base.install -d %name-%version/%{base_arch}
+%gst_plugins_good.install -d %name-%version/%{base_arch}
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_minmaj}/tools
 cd $RPM_BUILD_ROOT%{_bindir}
@@ -170,10 +250,16 @@
 chmod 755 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
 chmod 755 $RPM_BUILD_ROOT%{_mandir}/man5/*.5
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_minmaj}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_minmaj}/*.a
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
+# Remove gobject-introspection files.
+#
+rm -rf $RPM_BUILD_ROOT%{_libdir}/girepository-1.0
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/girepository-1.0
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gir-1.0 
+
 # RBAC related
 mkdir $RPM_BUILD_ROOT/etc/security
 
@@ -210,27 +296,36 @@
 %{_libdir}/gstreamer-%{gst_minmaj}/lib*.so*
 %{_libdir}/gstreamer-%{gst_minmaj}/tools
 %{_libdir}/gstreamer-%{gst_minmaj}/gst-plugin-scanner
+%ifarch amd64 sparcv9
+%dir %attr(0755, root, bin) %{_bindir}/%{_arch64}
+%{_bindir}/%{_arch64}/gst*
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/libgst*.so*
+%{_libdir}/%{_arch64}/gstreamer-%{gst_minmaj}/lib*.so*
+%{_libdir}/%{_arch64}/gstreamer-%{gst_minmaj}/tools
+%{_libdir}/%{_arch64}/gstreamer-%{gst_minmaj}/gst-plugin-scanner
+%endif
 %dir %attr (0755, root, sys) %{_datadir}
-%doc gstreamer-%{gst.version}/AUTHORS
-%doc gstreamer-%{gst.version}/README
-%doc(bzip2) gstreamer-%{gst.version}/COPYING
-%doc(bzip2) gstreamer-%{gst.version}/NEWS
-%doc(bzip2) gstreamer-%{gst.version}/ChangeLog
-%doc(bzip2) gstreamer-%{gst.version}/common/ChangeLog
-%doc gst-plugins-base-%{gst_plugins_base.version}/AUTHORS
-%doc gst-plugins-base-%{gst_plugins_base.version}/README
-%doc(bzip2) gst-plugins-base-%{gst_plugins_base.version}/COPYING
-%doc(bzip2) gst-plugins-base-%{gst_plugins_base.version}/COPYING.LIB
-%doc(bzip2) gst-plugins-base-%{gst_plugins_base.version}/NEWS
-%doc(bzip2) gst-plugins-base-%{gst_plugins_base.version}/ChangeLog 
-%doc(bzip2) gst-plugins-base-%{gst_plugins_base.version}/common/ChangeLog
-%doc gst-plugins-good-%{gst_plugins_good.version}/AUTHORS
-%doc gst-plugins-good-%{gst_plugins_good.version}/README
-%doc(bzip2) gst-plugins-good-%{gst_plugins_good.version}/COPYING
-%doc(bzip2) gst-plugins-good-%{gst_plugins_good.version}/NEWS
-%doc(bzip2) gst-plugins-good-%{gst_plugins_good.version}/ChangeLog 
-%doc(bzip2) gst-plugins-good-%{gst_plugins_good.version}/common/ChangeLog
-%doc(bzip2) gst-plugins-good-%{gst_plugins_good.version}/docs/random/ChangeLog-0.8
+%doc %{base_arch}/gstreamer-%{gst.version}/AUTHORS
+%doc %{base_arch}/gstreamer-%{gst.version}/README
+%doc(bzip2) %{base_arch}/gstreamer-%{gst.version}/COPYING
+%doc(bzip2) %{base_arch}/gstreamer-%{gst.version}/NEWS
+%doc(bzip2) %{base_arch}/gstreamer-%{gst.version}/ChangeLog
+%doc(bzip2) %{base_arch}/gstreamer-%{gst.version}/common/ChangeLog
+%doc %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/AUTHORS
+%doc %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/README
+%doc(bzip2) %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/COPYING
+%doc(bzip2) %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/COPYING.LIB
+%doc(bzip2) %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/NEWS
+%doc(bzip2) %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/ChangeLog 
+%doc(bzip2) %{base_arch}/gst-plugins-base-%{gst_plugins_base.version}/common/ChangeLog
+%doc %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/AUTHORS
+%doc %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/README
+%doc(bzip2) %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/COPYING
+%doc(bzip2) %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/NEWS
+%doc(bzip2) %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/ChangeLog 
+%doc(bzip2) %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/common/ChangeLog
+%doc(bzip2) %{base_arch}/gst-plugins-good-%{gst_plugins_good.version}/docs/random/ChangeLog-0.8
 %dir %attr (0755, root, other) %{_datadir}/doc
 %dir %attr (0755, root, other) %{_datadir}/gstreamer-0.10
 %{_datadir}/gstreamer-0.10/*
@@ -252,6 +347,11 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/gstreamer-%{gst_minmaj}/gst
 %dir %attr (0755, root, sys) %{_datadir}

--- a/base-specs/gst-plugins-base.spec	Tue Apr 13 15:37:14 2010 +0000
+++ b/base-specs/gst-plugins-base.spec	Wed Apr 14 00:14:13 2010 +0000
@@ -25,6 +25,7 @@
 %endif
 #owner:laca date:2006-01-19 type:bug bugster:6570425
 Patch1:         gst-plugins-base-01-gettext.diff
+Patch2:         gst-plugins-base-02-makefile.diff
 BuildRoot:      %{_tmppath}/gst-plugins-base-%{version}-root
 Docdir:         %{_defaultdocdir}/doc
 Autoreqprov:    on
@@ -36,8 +37,8 @@
 BuildRequires:  glib2-devel >= %_glib2
 # Needed for ximagesink
 BuildRequires:  XFree86-devel
-BuildRequires: 	gstreamer-devel >= 0.10.0
-BuildRequires:	gstreamer-tools >= 0.10.0
+BuildRequires:  gstreamer-devel >= 0.10.0
+BuildRequires:  gstreamer-tools >= 0.10.0
 BuildRequires:  libtheora-devel
 BuildRequires:  audiofile-devel >= 0.2.1
 BuildRequires:  gnome-vfs-devel > 1.9.4.00
@@ -45,23 +46,23 @@
 BuildRequires:  libvorbis-devel >= 1.0
 
 Requires:       glib2 >= %_glib2
-Requires: 	gstreamer >= 0.10.0
+Requires:       gstreamer >= 0.10.0
 Requires:       libtheora
 Requires:       audiofile >= 0.2.1
 Requires:       gnome-vfs > 1.9.4.00
 Requires:       libogg >= 1.0
 Requires:       libvorbis >= 1.0
-Requires: 	XFree86-libs
-Requires: 	GConf
-Requires:	libpng
-Requires:	liboil
+Requires:       XFree86-libs
+Requires:       GConf
+Requires:       libpng
+Requires:       liboil
 BuildRequires:  liboil-devel
 
 %package -n gstreamer-plugins-devel
-Summary: 	GStreamer Plugin Library Headers.
-Group: 		Development/Libraries
-Requires: 	%name = %{version}
-Provides:	gstreamer-play-devel = %{version}
+Summary:        GStreamer Plugin Library Headers.
+Group:          Development/Libraries
+Requires:       %name = %{version}
+Provides:       gstreamer-play-devel = %{version}
 
 %description -n gstreamer-plugins-devel
 GStreamer support libraries header files.
@@ -77,6 +78,7 @@
 %prep
 %setup -n gst-plugins-base-%{version} -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -101,12 +103,15 @@
 #
 ./configure \
   --prefix=%{_prefix} \
+  --bindir=%{_bindir} \
+  --libdir=%{_libdir} \
   --sysconfdir=%{_sysconfdir}   \
   --mandir=%{_mandir}   \
   %{gtk_doc_option}    \
   --with-install-plugins-helper=/usr/bin/codeina \
   --enable-external \
-  --enable-experimental
+  --enable-experimental \
+  $GST_EXTRA_CONFIG
 
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)
@@ -121,14 +126,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# Clean out files that should not be part of the rpm.
-# This is the recommended way of dealing with it for RH8
-rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-*/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/girepository-1.0
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gir-1.0
-
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 

--- a/base-specs/gst-plugins-good.spec	Tue Apr 13 15:37:14 2010 +0000
+++ b/base-specs/gst-plugins-good.spec	Wed Apr 14 00:14:13 2010 +0000
@@ -52,10 +52,11 @@
 #owner:wangke date:2009-09-01 type:branding
 Patch8:         gst-plugins-good-08-v4l2.diff
 #owner:wangke date:2009-09-03 type:branding doo:10036
-Patch9:		gst-plugins-good-09-sunaudiomixer.diff
+Patch9:         gst-plugins-good-09-sunaudiomixer.diff
 # Sun Studio compiler bug - #6926704
 #owner:yippi date:2010-02-11 type:feature
 Patch10:        gst-plugins-good-10-videomixer.diff
+Patch11:        gst-plugins-good-11-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/doc
 Autoreqprov:    on
@@ -115,6 +116,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
@@ -139,13 +141,16 @@
 # GStreamer.
 # Disable the oss plugin.  We use the ossv4 plugin if OSS is enabled.
 ./configure \
-  --prefix=%{_prefix}	\
+  --prefix=%{_prefix} \
+  --bindir=%{_bindir} \
+  --libdir=%{_libdir} \
   --sysconfdir=%{_sysconfdir} \
-  --mandir=%{_mandir}	\
-  --disable-cdio	\
-  --disable-oss		\
-  %{gtk_doc_option}	\
-  --enable-external
+  --mandir=%{_mandir} \
+  --disable-cdio \
+  --disable-oss \
+  %{gtk_doc_option} \
+  --enable-external \
+  $GST_EXTRA_CONFIG
 
 # FIXME: hack: stop the build from looping
 touch po/stamp-it
@@ -163,10 +168,8 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# Clean out files that should not be part of the rpm.
-# This is the recommended way of dealing with it for RH8
-rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
+# Remove gst-visualise-0.10.  It is a test program that should not be
+# delivered.
 rm $RPM_BUILD_ROOT%{_bindir}/gst-visualise-0.10
 
 %clean

--- a/base-specs/gst.spec	Tue Apr 13 15:37:14 2010 +0000
+++ b/base-specs/gst.spec	Wed Apr 14 00:14:13 2010 +0000
@@ -33,8 +33,8 @@
 Autoreqprov:  on
 Prereq:         /sbin/ldconfig
 
-%define         glib2_version	2.0.1
-%define         libxml2_version	2.4.0
+%define         glib2_version   2.0.1
+%define         libxml2_version 2.4.0
 
 Requires:       glib2 >= %{glib2_version}
 Requires:       libxml2 >= %{libxml2_version}
@@ -119,6 +119,8 @@
 automake -a -c -f
 ./configure \
   --prefix=%{_prefix} \
+  --bindir=%{_bindir} \
+  --libdir=%{_libdir} \
   --libexecdir=%{_libexecdir} \
   --sysconfdir=%{_sysconfdir} \
   --mandir=%{_mandir}   \
@@ -133,11 +135,6 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_libdir}/*/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/girepository-1.0
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gir-1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-base-02-makefile.diff	Wed Apr 14 00:14:13 2010 +0000
@@ -0,0 +1,19 @@
+--- gst-plugins-base-0.10.28/tests/examples/volume/Makefile.am-orig	2010-04-09 02:14:23.674465841 -0500
++++ gst-plugins-base-0.10.28/tests/examples/volume/Makefile.am	2010-04-09 02:14:29.884178865 -0500
+@@ -2,5 +2,5 @@ if HAVE_GTK
+ noinst_PROGRAMS = volume
+ volume_SOURCES = volume.c
+ volume_CFLAGS = $(GTK_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE
+-volume_LDFLAGS = $(GTK_LIBS) $(GST_LIBS) $(LIBM)
++volume_LDADD = $(GTK_LIBS) $(GST_LIBS) $(LIBM)
+ endif
+--- gst-plugins-base-0.10.28/tests/examples/gio/Makefile.am-orig	2010-04-09 02:08:51.016139266 -0500
++++ gst-plugins-base-0.10.28/tests/examples/gio/Makefile.am	2010-04-09 02:10:36.759086934 -0500
+@@ -3,6 +3,6 @@ if USE_GIO
+ noinst_PROGRAMS = giosrc-mounting
+ giosrc_mounting_SOURCES = giosrc-mounting.c
+ giosrc_mounting_CFLAGS = $(GTK_CFLAGS) $(GIO_CFLAGS) $(GST_CFLAGS)
+-giosrc_mounting_LDFLAGS = $(GTK_LIBS) $(GIO_LIBS) $(GST_LIBS)
++giosrc_mounting_LDADD = $(GTK_LIBS) $(GIO_LIBS) $(GST_LIBS)
+ endif
+ endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-good-11-makefile.diff	Wed Apr 14 00:14:13 2010 +0000
@@ -0,0 +1,28 @@
+--- gst-plugins-good-0.10.21/tests/examples/spectrum/Makefile.am-orig	2010-04-09 03:49:45.581633453 -0500
++++ gst-plugins-good-0.10.21/tests/examples/spectrum/Makefile.am	2010-04-09 03:49:53.108189862 -0500
+@@ -4,13 +4,13 @@ endif
+ 
+ demo_osssrc_SOURCES = demo-osssrc.c
+ demo_osssrc_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
+-demo_osssrc_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
++demo_osssrc_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+ 
+ demo_audiotest_SOURCES = demo-audiotest.c
+ demo_audiotest_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
+-demo_audiotest_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
++demo_audiotest_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+ 
+ spectrum_example_SOURCES = spectrum-example.c
+ spectrum_example_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
+-spectrum_example_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
++spectrum_example_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+ 
+--- gst-plugins-good-0.10.21/tests/examples/equalizer/Makefile.am-orig	2010-04-09 03:49:30.780301318 -0500
++++ gst-plugins-good-0.10.21/tests/examples/equalizer/Makefile.am	2010-04-09 03:49:36.509617126 -0500
+@@ -4,5 +4,5 @@ endif
+ 
+ demo_SOURCES = demo.c
+ demo_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
+-demo_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
++demo_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+