rpms/totem/devel totem-1.2.0-gmoduledep.patch, NONE, 1.1 totem.spec, 1.30, 1.31

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Oct 28 18:05:42 UTC 2005


Author: johnp

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18566

Modified Files:
	totem.spec 
Added Files:
	totem-1.2.0-gmoduledep.patch 
Log Message:
- Add patch to include gmodule explicitly to comply with changes
  in glib



totem-1.2.0-gmoduledep.patch:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE totem-1.2.0-gmoduledep.patch ---
--- totem-1.2.0/configure.in.gmoduledep	2005-10-28 11:22:19.000000000 -0400
+++ totem-1.2.0/configure.in	2005-10-28 11:22:47.000000000 -0400
@@ -139,10 +139,10 @@
 dnl Seems that the order matters because libtool blows
 dnl Also check if we're going to be using GTK+ only
 if test x$ENABLE_GTK = "xno" ; then
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS iso-codes libmusicbrainz $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 iso-codes libmusicbrainz $MM)
 	HAVE_GNOME=yes
 else
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS iso-codes libmusicbrainz $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 iso-codes libmusicbrainz $MM)
 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
 	HAVE_GNOME=no


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- totem.spec	26 Oct 2005 20:28:49 -0000	1.30
+++ totem.spec	28 Oct 2005 18:04:54 -0000	1.31
@@ -4,14 +4,14 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.2.0
-Release: 1 
+Release: 2 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
 Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch1: totem-0.99.19-feature-help-removal.patch
-
+Patch2: totem-1.2.0-gmoduledep.patch
 Requires(post): GConf2
 Requires: gnome-desktop >= 2.6.0
 Requires: gstreamer >= %gstreamer_version
@@ -50,9 +50,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
+%patch2 -p1 -b .gmoduledep
 
 %build
-
+autoreconf
 %configure --enable-gstreamer --disable-lirc --disable-vanity --disable-mozilla --disable-nvtv
 
 #apparently someone forgot to autogen before disting 0.99.17 :)




More information about the fedora-cvs-commits mailing list