- updated to 2.22.0; merged changes from DEVEL

Changed files:
    totem.spec -> 1.136

diff --git a/totem.spec b/totem.spec
index fed861a9a6a21af1bedea9422a0c7120775f9ed4..959b0a6fdc441cbb7562efd7d43d56a221b90c2b 100644 (file)
--- a/totem.spec
+++ b/totem.spec
@@ -13,44 +13,49 @@
 Summary:       Movie player for GNOME 2 based on the gstreamer engine
 Summary(pl.UTF-8):     Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer
 Name:          totem
-Version:       2.20.3
-Release:       2
-License:       GPL
-Group:         Applications/Multimedia
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/totem/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 7360e0856042615c7c1c3baf03d50bbf
+Version:       2.22.0
+Release:       1
+License:       GPL v2
+Group:         X11/Applications/Multimedia
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/totem/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: 21a3f983e762b34db035edbaaba9dd63
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-idl.patch
 Patch2:                %{name}-configure.patch
 Patch3:                %{name}-codegen.patch
 URL:           http://www.gnome.org/projects/totem/
-BuildRequires: GConf2-devel >= 2.20.0
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake >= 1:1.9
 %{?with_bemused:BuildRequires: bluez-libs-devel}
-BuildRequires: dbus-glib-devel >= 0.73
-BuildRequires: gnome-control-center-devel
-BuildRequires: gnome-desktop-devel >= 2.20.0
-BuildRequires: gnome-vfs2-devel >= 2.20.0
-%{?with_gstreamer:BuildRequires:       gstreamer-plugins-base-devel >= 0.10.10}
-BuildRequires: gtk+2-devel >= 2:2.12.1
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.1
+BuildRequires: gmyth-devel
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-doc-utils >= 0.12.0
+BuildRequires: gnome-vfs2-devel >= 2.22.0
+%{?with_gstreamer:BuildRequires:       gstreamer-plugins-base-devel >= 0.10.12}
+BuildRequires: gtk+2-devel >= 2:2.12.8
 BuildRequires: intltool >= 0.36.2
 BuildRequires: iso-codes
+BuildRequires: libepc-ui-devel
 BuildRequires: libgalago-devel >= 0.5.2
-BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.20.0
-BuildRequires: libmusicbrainz-devel
+BuildRequires: libgnomeui-devel >= 2.22.01
 %{?with_nvtv:BuildRequires:    libnvtvsimple-devel >= 0.4.5}
 BuildRequires: libtool
+BuildRequires: libtracker-devel
 %{?with_lirc:BuildRequires:    lirc-devel}
-BuildRequires: nautilus-cd-burner-devel >= 2.20.0
-BuildRequires: nautilus-devel >= 2.20.0
+BuildRequires: nautilus-devel >= 2.22.0
 BuildRequires: pkgconfig
+BuildRequires: python-pygtk-devel >= 2:2.12.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: scrollkeeper
 BuildRequires: sed >= 4.0
 BuildRequires: shared-mime-info >= 0.22
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: totem-pl-parser-devel >= 2.22.1
 %{!?with_gstreamer:BuildRequires:      xine-lib-devel >= 2:1.0.2-1}
 BuildRequires: xorg-lib-libXv-devel
 BuildRequires: xorg-lib-libXxf86vm-devel >= 1.0.1
@@ -59,7 +64,6 @@ Requires(post,postun):        gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,preun):  GConf2
-Requires:      %{name}-libs = %{version}-%{release}
 %if %{with gstreamer}
 Requires:      gstreamer-GConf >= 0.10.3
 Requires:      gstreamer-audiosink >= 0.10
@@ -69,13 +73,13 @@ Requires:   xine-plugin-video
 # unusable
 Conflicts:     xine-input-gnome-vfs
 %endif
-Requires:      gtk+2 >= 2:2.12.1
-Requires:      nautilus >= 2.20.0
-%requires_eq   xulrunner-libs
+Requires:      gtk+2 >= 2:2.12.8
+Requires:      nautilus >= 2.22.0
 Suggests:      galago-daemon
 Suggests:      gstreamer-ffmpeg
 Suggests:      gstreamer-mpeg
 Suggests:      gstreamer-pango
+Suggests:      python-gdata
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -105,44 +109,6 @@ położenia w pliku i głośności, a także w miarę kompletną obsługę z
 klawiatury.
 %endif
 
-%package libs
-Summary:       Totem shared libraries
-Summary(pl.UTF-8):     Współdzielone biblioteki Totema
-Group:         Libraries
-Requires:      gnome-desktop-libs >= 2.20.0
-Requires:      nautilus-libs >= 2.20.0
-
-%description libs
-Totem shared libraries.
-
-%description libs -l pl.UTF-8
-Współdzielone biblioteki Totema.
-
-%package devel
-Summary:       Totem include files
-Summary(pl.UTF-8):     Pliki nagłówkowe Totema
-Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
-Requires:      gtk+2-devel >= 2:2.12.1
-
-%description devel
-Totem headers files.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe Totema.
-
-%package static
-Summary:       Static Totem libraries
-Summary(pl.UTF-8):     Statyczne biblioteki Totema
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static Totem libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki Totema.
-
 %package -n browser-plugin-%{name}
 Summary:       Totem's browser plugin
 Summary(pl.UTF-8):     Wtyczka Totema do przeglądarek WWW
@@ -168,14 +134,15 @@ Wtyczka Totem do przeglądarek WWW.
 %patch2 -p1
 %patch3 -p1
 
-sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
-mv po/sr\@{Latn,latin}.po
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --disable-scrollkeeper \
@@ -200,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -f $RPM_BUILD_ROOT%{_browserpluginsdir}/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{la,a}
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -210,6 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install totem-handlers.schemas
+%gconf_schema_install totem-mythtv.schemas
 %gconf_schema_install totem-video-thumbnail.schemas
 %gconf_schema_install totem.schemas
 %scrollkeeper_update_post
@@ -218,6 +186,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 %gconf_schema_uninstall totem-handlers.schemas
+%gconf_schema_uninstall totem-mythtv.schemas
 %gconf_schema_uninstall totem-video-thumbnail.schemas
 %gconf_schema_uninstall totem.schemas
 
@@ -226,9 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %update_desktop_database_postun
 %update_icon_cache hicolor
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
-
 %post -n browser-plugin-%{name}
 %update_browser_plugins
 
@@ -241,47 +207,70 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/totem
+%attr(755,root,root) %{_bindir}/totem-audio-preview
 %attr(755,root,root) %{_bindir}/totem-video-indexer
 %attr(755,root,root) %{_bindir}/totem-video-thumbnailer
-%attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so
+%attr(755,root,root) %{_libdir}/totem/totem-bugreport.py
 %{_datadir}/%{name}
 %{_desktopdir}/totem.desktop
 %{_mandir}/man1/totem.1*
 %{_mandir}/man1/totem-video-thumbnailer.1*
 %{_iconsdir}/hicolor/*/*/totem.*
-#%{_pixmapsdir}/vanity.png
 %{_sysconfdir}/gconf/schemas/totem-handlers.schemas
+%{_sysconfdir}/gconf/schemas/totem-mythtv.schemas
 %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas
 %{_sysconfdir}/gconf/schemas/totem.schemas
 %dir %{_libdir}/totem
 %dir %{_libdir}/totem/plugins
-%{?with_bemused:%dir %{_libdir}/totem/plugins/bemused}
+%if %{with bemused}
+%dir %{_libdir}/totem/plugins/bemused
+%attr(755,root,root) %{_libdir}/totem/plugins/bemused/libbemused.so
+%endif
 %dir %{_libdir}/totem/plugins/galago
+%attr(755,root,root) %{_libdir}/totem/plugins/galago/libtgp.so
+%{_libdir}/totem/plugins/galago/galago.totem-plugin
 %dir %{_libdir}/totem/plugins/gromit
+%attr(755,root,root) %{_libdir}/totem/plugins/gromit/libgromit.so
+%{_libdir}/totem/plugins/gromit/gromit.totem-plugin
 %dir %{_libdir}/totem/plugins/lirc
+%attr(755,root,root) %{_libdir}/totem/plugins/lirc/liblirc.so
+%{_libdir}/totem/plugins/lirc/lirc.totem-plugin
 %dir %{_libdir}/totem/plugins/media-player-keys
+%attr(755,root,root) %{_libdir}/totem/plugins/media-player-keys/libmedia_player_keys.so
+%{_libdir}/totem/plugins/media-player-keys/media-player-keys.totem-plugin
+%dir %{_libdir}/totem/plugins/mythtv
+%attr(755,root,root) %{_libdir}/totem/plugins/mythtv/libtotem_mythtv.so
+%{_libdir}/totem/plugins/mythtv/mythtv.totem-plugin
 %dir %{_libdir}/totem/plugins/ontop
+%attr(755,root,root) %{_libdir}/totem/plugins/ontop/libontop.so
+%{_libdir}/totem/plugins/ontop/ontop.totem-plugin
 %dir %{_libdir}/totem/plugins/properties
+%attr(755,root,root) %{_libdir}/totem/plugins/properties/libmovie-properties.so
+%{_libdir}/totem/plugins/properties/movie-properties.totem-plugin
+%dir %{_libdir}/totem/plugins/publish
+%attr(755,root,root) %{_libdir}/totem/plugins/publish/libpublish.so
+%{_libdir}/totem/plugins/publish/publish-plugin.ui
+%{_libdir}/totem/plugins/publish/publish.totem-plugin
 %dir %{_libdir}/totem/plugins/screensaver
+%attr(755,root,root) %{_libdir}/totem/plugins/screensaver/libscreensaver.so
+%{_libdir}/totem/plugins/screensaver/screensaver.totem-plugin
 %dir %{_libdir}/totem/plugins/skipto
-%attr(755,root,root) %{_libdir}/totem/plugins/*/*.so
-%{_libdir}/totem/plugins/*/*.totem-plugin
-%{_libdir}/totem/plugins/*/*.ui
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libtotem-plparser.so.*.*.*
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libtotem-plparser.so
-%{_libdir}/libtotem-plparser.la
-%{_includedir}/totem
-%{_pkgconfigdir}/totem-plparser.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libtotem-plparser.a
+%attr(755,root,root) %{_libdir}/totem/plugins/skipto/libskipto.so
+%{_libdir}/totem/plugins/skipto/skipto.totem-plugin
+%{_libdir}/totem/plugins/skipto/skipto.ui
+%dir %{_libdir}/totem/plugins/thumbnail
+%attr(755,root,root) %{_libdir}/totem/plugins/thumbnail/libthumbnail.so
+%{_libdir}/totem/plugins/thumbnail/thumbnail.totem-plugin
+%dir %{_libdir}/totem/plugins/totem
+%{_libdir}/totem/plugins/totem/*.py[co]
+%dir %{_libdir}/totem/plugins/tracker
+%attr(755,root,root) %{_libdir}/totem/plugins/tracker/libtracker.so
+%{_libdir}/totem/plugins/tracker/tracker.totem-plugin
+%dir %{_libdir}/totem/plugins/youtube
+%{_libdir}/totem/plugins/youtube/youtube.py[co]
+%{_libdir}/totem/plugins/youtube/youtube.totem-plugin
+%{_libdir}/totem/plugins/youtube/youtube.ui
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)