[parole] Update to 2.0.6 Obsolete parole-mozplugin Drop libnotify patch, no longer needed

[Christoph Wickert]

commit a77dbdc8a154ddae2c368d7d61c17cd57e5c70e3
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Jun 6 00:00:48 2011 +0200

    Update to 2.0.6
    Obsolete parole-mozplugin
    Drop libnotify patch, no longer needed

 parole-0.2.0.2-dsofix.patch    |   24 --------------------
 parole-0.2.0.2-libnotify.patch |   12 ----------
 parole-0.2.0.6-dsofix.patch    |   12 ++++++++++
 parole.spec                    |   48 ++++++++++++---------------------------
 4 files changed, 27 insertions(+), 69 deletions(-)
---
diff --git a/parole-0.2.0.6-dsofix.patch b/parole-0.2.0.6-dsofix.patch
new file mode 100644
index 0000000..d66a89a
--- /dev/null
+++ b/parole-0.2.0.6-dsofix.patch
@@ -0,0 +1,12 @@
+diff -Nur parole-0.2.0.2.orig/src/Makefile.in parole-0.2.0.2/src/Makefile.in
+--- parole-0.2.0.2.orig/src/Makefile.in	2010-01-25 04:47:27.000000000 -0700
++++ parole-0.2.0.2/src/Makefile.in	2010-02-18 13:55:57.000000000 -0700
+@@ -205,7 +205,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lX11
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
diff --git a/parole.spec b/parole.spec
index 8d6c58b..1b1c45d 100644
--- a/parole.spec
+++ b/parole.spec
@@ -1,19 +1,18 @@
-# by default build the browser plugin
-# use bcond_with to change the default
-%bcond_without mozilla
+# Review at https://bugzilla.redhat.com/show_bug.cgi?id=527840
+
+%global minorversion 0.2
 
 Name:           parole
-Version:        0.2.0.2
-Release:        6%{?dist}
+Version:        0.2.0.6
+Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
-Source0:        http://archive.xfce.org/src/apps/parole/0.2/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
 # Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6244
-Patch1:		parole-0.2.0.2-dsofix.patch
-Patch2:         parole-0.2.0.2-libnotify.patch
+Patch1:	        parole-0.2.0.6-dsofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -26,11 +25,10 @@ BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext 
 BuildRequires:  intltool
-%if %{with mozilla}
-BuildRequires:  xulrunner-devel
-%endif
 BuildRequires:  gtk-doc
 Requires:       gstreamer-plugins-good
+# Obsolete the dead mozilla plugin
+Obsoletes:      %{name}-mozplugin <= 2.0.2-7
 
 %description
 Parole is a modern simple media player based on the GStreamer framework and 
@@ -44,19 +42,6 @@ following features:
 * Playback of live sources
 
 
-%if %{with mozilla}
-%package        mozplugin
-Summary:        Browser plugin for for %{name}
-Requires:       %{name} = %{version}-%{release}
-Requires:       mozilla-filesystem
-
-%description    mozplugin
-Parole is a modern simple media player based on the GStreamer framework and 
-written to fit well in the Xfce desktop. This plugin allows it to be embedded
-in a web browser.
-%endif
-
-
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -70,7 +55,7 @@ The %{name}-devel package contains header files for developing plugins for
 %prep
 %setup -q
 %patch1 -p1 
-%patch2 -p1 
+
 
 %build
 %configure --disable-static --enable-gtk-doc \
@@ -127,14 +112,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/
 
 
-%if %{with mozilla}
-%files mozplugin
-%defattr(-,root,root,-)
-%{_libexecdir}/%{name}-media-plugin
-%{_libdir}/mozilla/plugins/%{name}-player.so
-%endif
-
-
 %files devel
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/
@@ -142,6 +119,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jun 06 2011 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.6-1
+- Update to 2.0.6
+- Obsolete parole-mozplugin
+- Drop libnotify patch, no longer needed
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild