rpms/totem/devel totem-2.17.5-make-j.patch, 1.1, 1.2 totem.spec, 1.92, 1.93
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 17 15:48:04 UTC 2007
Author: mclasen
Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10174
Modified Files:
totem-2.17.5-make-j.patch totem.spec
Log Message:
try again
totem-2.17.5-make-j.patch:
Makefile.am | 12 ++++++------
Makefile.in | 24 ++++++++++++------------
2 files changed, 18 insertions(+), 18 deletions(-)
Index: totem-2.17.5-make-j.patch
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem-2.17.5-make-j.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- totem-2.17.5-make-j.patch 17 Jan 2007 15:08:05 -0000 1.1
+++ totem-2.17.5-make-j.patch 17 Jan 2007 15:48:02 -0000 1.2
@@ -1,5 +1,115 @@
---- totem-2.17.5/browser-plugin/Makefile.am.make-j 2007-01-17 10:07:23.000000000 -0500
-+++ totem-2.17.5/browser-plugin/Makefile.am 2007-01-17 10:07:32.000000000 -0500
+--- totem-2.17.5/browser-plugin/Makefile.in.make-j 2007-01-17 10:45:41.000000000 -0500
++++ totem-2.17.5/browser-plugin/Makefile.in 2007-01-17 10:49:24.000000000 -0500
+@@ -73,7 +73,7 @@
+ LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @ENABLE_BASIC_PLUGIN_TRUE at libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+ am__libtotem_basic_plugin_la_SOURCES_DIST = totemPluginGlue.cpp \
+@@ -88,7 +88,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE at am_libtotem_basic_plugin_la_rpath = -rpath \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(plugindir)
+ @ENABLE_COMPLEX_PLUGIN_TRUE at libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+ am__libtotem_complex_plugin_la_SOURCES_DIST = totemPluginGlue.cpp \
+@@ -103,7 +103,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE at am_libtotem_complex_plugin_la_rpath = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ -rpath $(plugindir)
+ @ENABLE_GMP_PLUGIN_TRUE at libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+ am__libtotem_gmp_plugin_la_SOURCES_DIST = totemPluginGlue.cpp \
+@@ -117,7 +117,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE at am_libtotem_gmp_plugin_la_rpath = -rpath \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(plugindir)
+ @ENABLE_MULLY_PLUGIN_TRUE at libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+ am__libtotem_mully_plugin_la_SOURCES_DIST = totemPluginGlue.cpp \
+@@ -132,7 +132,7 @@
+ @ENABLE_MULLY_PLUGIN_TRUE at am_libtotem_mully_plugin_la_rpath = -rpath \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(plugindir)
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE at libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1)
+ am__libtotem_narrowspace_plugin_la_SOURCES_DIST = totemPluginGlue.cpp \
+@@ -161,7 +161,7 @@
+ $(top_builddir)/src/libbaconpropertiespage.la \
+ $(top_builddir)/src/libtotem_player.la \
+ $(top_builddir)/src/plparse/libtotem-plparser.la \
+- $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ libtotempluginviewer_marshal.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -518,7 +518,7 @@
+ $(top_builddir)/src/libbaconpropertiespage.la \
+ $(top_builddir)/src/libtotem_player.la \
+ $(top_builddir)/src/plparse/libtotem-plparser.la \
+- $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ libtotempluginviewer_marshal.la \
+ $(EXTRA_GNOME_LIBS) \
+ $(XVIDMODE_LIBS) \
+ $(DBUS_LIBS) \
+@@ -566,7 +566,7 @@
+
+ @ENABLE_BASIC_PLUGIN_TRUE at libtotem_basic_plugin_la_LIBADD = \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+ @ENABLE_BASIC_PLUGIN_TRUE@ $(LIBXPCOMGLUE_S)
+@@ -617,7 +617,7 @@
+
+ @ENABLE_GMP_PLUGIN_TRUE at libtotem_gmp_plugin_la_LIBADD = \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+ @ENABLE_GMP_PLUGIN_TRUE@ $(LIBXPCOMGLUE_S)
+@@ -668,7 +668,7 @@
+
+ @ENABLE_COMPLEX_PLUGIN_TRUE at libtotem_complex_plugin_la_LIBADD = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ $(LIBXPCOMGLUE_S)
+@@ -719,7 +719,7 @@
+
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE at libtotem_narrowspace_plugin_la_LIBADD = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(LIBXPCOMGLUE_S)
+@@ -770,7 +770,7 @@
+
+ @ENABLE_MULLY_PLUGIN_TRUE at libtotem_mully_plugin_la_LIBADD = \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
+- at ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/browser-plugin/libtotempluginviewer_marshal.la \
++ at ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \
+ @ENABLE_MULLY_PLUGIN_TRUE@ $(LIBXPCOMGLUE_S)
+--- totem-2.17.5/browser-plugin/Makefile.am.make-j 2007-01-09 09:26:48.000000000 -0500
++++ totem-2.17.5/browser-plugin/Makefile.am 2007-01-17 10:41:01.000000000 -0500
@@ -87,7 +87,7 @@
$(top_builddir)/src/libbaconpropertiespage.la \
$(top_builddir)/src/libtotem_player.la \
Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- totem.spec 17 Jan 2007 15:28:14 -0000 1.92
+++ totem.spec 17 Jan 2007 15:48:02 -0000 1.93
@@ -43,9 +43,6 @@
BuildRequires: dbus-devel
BuildRequires: hal-devel
BuildRequires: gnome-doc-utils
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: intltool
Obsoletes: nautilus-media
@@ -96,8 +93,6 @@
# not find playbin the first time around
/usr/bin/gst-inspect-0.10 --print-all > /dev/null
export MOZILLA_PLUGINDIR=%{_libdir}/mozilla
-aclocal
-automake
%configure \
--enable-gstreamer \
--disable-lirc \
More information about the fedora-cvs-commits
mailing list