Author: baggins Date: Wed May 17 12:56:42 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged from HEAD - BRs for GNOME 2.14
---- Files affected: SPECS: totem.spec (1.72.2.3 -> 1.72.2.4) ---- Diffs: ================================================================ Index: SPECS/totem.spec diff -u SPECS/totem.spec:1.72.2.3 SPECS/totem.spec:1.72.2.4 --- SPECS/totem.spec:1.72.2.3 Sun May 14 15:24:24 2006 +++ SPECS/totem.spec Wed May 17 14:56:37 2006 @@ -4,8 +4,8 @@ # - what more bowsers can be supported? # # Conditional build -%bcond_with gstreamer # build with gstreamer instead xine-lib %bcond_with mozilla_firefox # build with mozilla-firefox +%bcond_without gstreamer # build with gstreamer instead xine-lib %bcond_without nvtv # build without nvtv support # # nvtv only available on few archs @@ -16,56 +16,56 @@ Summary: Movie player for GNOME 2 based on the gstreamer engine Summary(pl): Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer Name: totem -Version: 1.2.2 -Release: 1 +Version: 1.4.0 +Release: 2 License: GPL Group: Applications/Multimedia -Source0: http://ftp.gnome.org/pub/gnome/sources/totem/1.2/%{name}-%{version}.tar.bz2 -# Source0-md5: a1ccda72948706edf13d2e1e69b48969 +Source0: http://ftp.gnome.org/pub/gnome/sources/totem/1.4/%{name}-%{version}.tar.bz2 +# Source0-md5: 34be929fc384b078afabd6d81ab47285 Patch0: %{name}-desktop.patch Patch1: %{name}-idl.patch Patch2: %{name}-mozilla_includes.patch +Patch3: %{name}-configure.patch URL: http://www.hadess.net/totem.php3 BuildRequires: GConf2-devel +BuildRequires: XFree86-devel BuildRequires: autoconf BuildRequires: automake -BuildRequires: dbus-glib-devel +BuildRequires: dbus-glib-devel >= 0.35 BuildRequires: gnome-desktop-devel -BuildRequires: gnome-vfs2-devel >= 2.12.0 +BuildRequires: gnome-vfs2-devel >= 2.14.0 +BuildRequires: rpmbuild(macros) >= 1.236 %if %{with gstreamer} -BuildRequires: gstreamer-GConf-devel >= 0.8.11 -BuildRequires: gstreamer-devel >= 0.8.11 -BuildRequires: gstreamer-plugins-devel >= 0.8.11 +BuildRequires: gstreamer-plugins-base-devel >= 0.10 %endif BuildRequires: gtk+2-devel >= 2:2.8.3 BuildRequires: intltool >= 0.34 BuildRequires: iso-codes BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel >= 2.12.0 +BuildRequires: libgnomeui-devel >= 2.14.0 BuildRequires: libmusicbrainz-devel +%{?with_nvtv:BuildRequires: libnvtvsimple-devel >= 0.4.5} BuildRequires: libtool -%{?with_nvtv:BuildRequires: libnvtvsimple-devel >= 0.4.5} BuildRequires: lirc-devel %if %{with mozilla_firefox} BuildRequires: mozilla-firefox-devel %else BuildRequires: mozilla-devel >= 5:1.7.12 %endif -BuildRequires: nautilus-cd-burner-devel >= 2.12.0 -BuildRequires: nautilus-devel >= 2.12.0 +BuildRequires: nautilus-cd-burner-devel >= 2.14.0 +BuildRequires: nautilus-devel >= 2.14.0 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper %{!?with_gstreamer:BuildRequires: xine-lib-devel >= 2:1.0.2-1} -Requires(post,preun): GConf2 Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 Requires: %{name}-libs = %{version}-%{release} Requires: XFree86-libs >= 4.3.0-1.3 -Requires: gnome-desktop >= 2.12.0 %if %{with gstreamer} -Requires: gstreamer-audiosink >= 0.8.11 -Requires: gstreamer-colorspace >= 0.8.11 -Requires: gstreamer-videosink >= 0.8.11 +Requires: gstreamer-GConf >= 0.10 +Requires: gstreamer-audiosink >= 0.10 +Requires: gstreamer-videosink >= 0.10 %else Requires: xine-plugin-video %endif @@ -110,7 +110,7 @@ Summary: Totem shared libraries Summary(pl): Współdzielone biblioteki Totema Group: Libraries -Requires: nautilus-libs >= 2.12.0 +Requires: nautilus-libs >= 2.14.0 %description libs Totem shared libraries. @@ -147,12 +147,12 @@ Summary: Totem's browser plugin Summary(pl): Wtyczka Totema do przeglądarek WWW Group: X11/Libraries -Requires: browser-plugins(%{_target_base_arch}) Requires: %{name} = %{version}-%{release} -Provides: mozilla-plugin-totem -Obsoletes: mozilla-plugin-totem +Requires: browser-plugins(%{_target_base_arch}) Provides: mozilla-firefox-plugin-totem +Provides: mozilla-plugin-totem Obsoletes: mozilla-firefox-plugin-totem +Obsoletes: mozilla-plugin-totem %description -n browser-plugin-%{name} Totem's plugin for browsers. @@ -169,6 +169,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -196,7 +197,6 @@ rm -f $RPM_BUILD_ROOT%{_plugindir}/*.{la,a} rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.{la,a} -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no %find_lang %{name} --all-name --with-gnome @@ -295,14 +295,52 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.72.2.3 2006/05/14 13:24:24 blues -- well, remove old junk +Revision 1.72.2.4 2006/05/17 12:56:37 baggins +- merged from HEAD +- BRs for GNOME 2.14 + +Revision 1.80 2006/05/14 12:45:58 blues +- browser plugin support finished + +Revision 1.79 2006/05/14 11:55:58 glen +- rpmbuild(macros) for nsplugin macros, adapter + +Revision 1.78 2006/05/14 11:29:31 blues +- started with browser plugins support, NFY + +Revision 1.77 2006/04/02 14:10:33 freetz +- disable checking for runtime deps at builtime (patch), dropped + gnome-desktop dependency (no required anymore) + +Revision 1.76 2006/04/02 13:32:08 freetz +- merged from DEVEL + +Revision 1.73.2.6 2006/03/13 15:04:00 freetz +- 1.4.0 + +Revision 1.73.2.5 2006/03/01 07:31:37 freetz +- 1.3.92 + +Revision 1.73.2.4 2006/02/22 18:43:39 freetz +- gstreamer by default for now, xorg deps, rel.2 + +Revision 1.73.2.3 2006/02/13 10:08:11 freetz +- 1.3.91, killed xfree86 requirement, xine backend not tested + +Revision 1.73.2.2 2006/01/31 15:02:46 freetz +- fixed gstreamer deps + +Revision 1.73.2.1 2006/01/31 02:07:55 patrys +- up to 1.3.90 + +Revision 1.75 2006/02/24 18:05:26 aredridel +- remove XFree86 dependency -Revision 1.72.2.2 2006/05/14 12:41:33 blues -- 1.2.2 - STBR to AC? +Revision 1.74 2006/02/02 13:44:14 maciek2w +- updated to 1.3.1 -Revision 1.72.2.1 2006/05/14 12:31:55 blues -- browser plugins support. Seems to be working +Revision 1.73 2005/12/21 21:18:55 patrys +- up to 1.3.0 Revision 1.72 2005/12/11 21:58:15 freetz - 1.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/totem.spec?r1=1.72.2.3&r2=1.72.2.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
