From de783052c489e580390015309511afbed700d07d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Sun, 9 Dec 2007 17:55:40 +0000
Subject: [PATCH] - Update to 2.21.5 - Remove -devel and -plparser subpackages,
 they're in totem-pl-parser now

---
 .cvsignore |  2 +-
 sources    |  2 +-
 totem.spec | 53 ++++++++---------------------------------------------
 3 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b20de08..8fe6f20 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-totem-2.21.3.tar.bz2
+totem-2.21.5.tar.bz2
diff --git a/sources b/sources
index 342e8bb..124092e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18e40c03d1a85ce116bd433f8b818886  totem-2.21.3.tar.bz2
+76b6f42066a4360c4306b44c2a639bba  totem-2.21.5.tar.bz2
diff --git a/totem.spec b/totem.spec
index 24c46d0..ad8fdb6 100644
--- a/totem.spec
+++ b/totem.spec
@@ -4,10 +4,10 @@
 %define gtk2_version	2.12.1
 %define gecko_version	1.9
 
-Summary: Movie player for GNOME 2
+Summary: Movie player for GNOME
 Name: totem
-Version: 2.21.3
-Release: 3%{?dist} 
+Version: 2.21.5
+Release: 1%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -28,7 +28,6 @@ Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
 Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
 Requires: iso-codes
 Requires: gnome-themes
-Requires: %{name}-plparser = %{version}-%{release}
 Requires: gtk2 >= %gtk2_version
 
 BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
@@ -53,6 +52,7 @@ BuildRequires: libgalago-devel
 BuildRequires: gmyth-devel
 BuildRequires: python-devel gnome-python2-devel pygtk2-devel
 BuildRequires: tracker-devel
+BuildRequires: totem-pl-parser-devel
 
 Obsoletes: nautilus-media
 
@@ -70,14 +70,6 @@ Requires: gecko-libs = %gecko_version
 Totem is simple movie player for the Gnome desktop. The mozilla plugin
 for totem allows totem to be embeded into a web browser. 
 
-%package plparser
-Summary: Totem playlist parser library
-License: LGPLv2+
-Group: Development/Libraries
-
-%description plparser
-A library to parse various forms of music playlists.
-
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Totem
 Group: Applications/Multimedia
@@ -127,25 +119,6 @@ Requires: %{name} = %{version}-%{release}
 A plugin to allow searching local videos, based on their tags, metadata,
 or filenames, as indexing by the Tracker indexer.
 
-%package devel
-Summary: Libraries/include files for Totem
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gnome-vfs2-devel
-Requires: libxml2-devel
-Requires: gtk2-devel
-Requires: pkgconfig
-
-%description devel
-Totem is simple movie player for the Gnome desktop. It features a
-simple playlist, a full-screen mode, seek and volume controls, as well as
-a pretty complete keyboard navigation.
-
-This package contains the libraries and includes files necessary to develop
-applications with Totem's plparser library.
-
-
 %prep
 %setup -q
 
@@ -170,10 +143,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --with-gnome
 
-# no static libs and libtool archives either
-find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
-find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -266,22 +235,16 @@ fi
 %defattr(-, root, root)
 %{_libdir}/totem/plugins/tracker
 
-%files plparser
-%defattr(-, root, root)
-%{_libdir}/libtotem-plparser.so.*
-
 %files mozplugin
 %defattr(-, root, root)
 %{_libdir}/mozilla/plugins/*
 %{_libexecdir}/totem-plugin-viewer
 
-%files devel
-%defattr(-, root, root)
-%{_includedir}/%{name}
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*so
-
 %changelog
+* Sun Dec 09 2007 - Bastien Nocera <bnocera@redhat.com>	- 2.21.5-1
+- Update to 2.21.5
+- Remove -devel and -plparser subpackages, they're in totem-pl-parser now
+
 * Thu Dec 06 2007 - Bastien Nocera <bnocera@redhat.com> - 2.21.3-3
 - The mozilla plugin only need gecko-libs, not devel
   Thanks to Jeremy Katz for noticing