rpms/gnome-media/devel gnome-media-2.17.90-disable-scrollkeeper.patch, NONE, 1.1 gnome-media.spec, 1.88, 1.89

[fedora-cvs-commits at redhat.com]

Author: bnocera

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8767

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-2.17.90-disable-scrollkeeper.patch 
Log Message:
* Thu Feb 08 2007 - Bastien Nocera <bnocera at redhat.com> - 2.17.90-6
- Fix rpath issue by using a newer libtool, disable scrollkeeper-update
  during package installation by patching omf.make


gnome-media-2.17.90-disable-scrollkeeper.patch:
 omf.make |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-media-2.17.90-disable-scrollkeeper.patch ---
--- gnome-media-2.17.90/omf.make.old	2007-02-08 17:41:21.000000000 +0000
+++ gnome-media-2.17.90/omf.make	2007-02-08 17:41:37.000000000 +0000
@@ -43,7 +43,7 @@ install-data-hook-omf:
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+#	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnome-media.spec	8 Feb 2007 13:19:06 -0000	1.88
+++ gnome-media.spec	8 Feb 2007 17:53:45 -0000	1.89
@@ -12,10 +12,11 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.17.90
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.17/gnome-media-%{version}.tar.bz2
+Patch0:         gnome-media-2.17.90-disable-scrollkeeper.patch
 Patch4:         gnome-media-2.16.0-settings.patch
 Patch5:         gnome-media-2.13.5-hide-help-button.patch
 
@@ -48,6 +49,7 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  perl-XML-Parser
+BuildRequires:  autoconf automake libtool
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -76,12 +78,15 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .scrollkeeper-disable
 %patch4 -p1 -b .settings
 %patch5 -p1 -b .hide-help-button
 
 %build
+libtoolize --force
+autoreconf
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
-%configure  --disable-scrollkeeper --disable-schemas-install --disable-rpath
+%configure  --disable-schemas-install
 make #%{?_smp_mflags}
 
 %install
@@ -193,6 +198,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Feb 08 2007 - Bastien Nocera <bnocera at redhat.com> - 2.17.90-6
+- Fix rpath issue by using a newer libtool, disable scrollkeeper-update
+  during package installation by patching omf.make
+
 * Thu Feb 08 2007 - Bastien Nocera <bnocera at redhat.com> - 2.17.90-5
 - Really fix rpath issue