[parole/f17] Revert changes that were never built for anything but rawhide and then fix the tray icon (#756495)

Christoph Wickert cwickert at fedoraproject.org
Sat Oct 20 09:40:38 UTC 2012 

commit 14433fa94ad3daf630873539a088e03e364bc773
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Oct 20 11:35:01 2012 +0200

    Revert changes that were never built for anything but rawhide and
    then fix the tray icon (#756495)
    
    Conflicts:
    	parole.spec

 parole-0.2.0.2-dsofix.patch    |   24 +++++++++++++++++
 parole-0.2.0.2-libnotify.patch |   16 +++++++++++
 parole.spec                    |   57 ++++++++++++++++++++++++++++------------
 3 files changed, 80 insertions(+), 17 deletions(-)
---
diff --git a/parole-0.2.0.2-dsofix.patch b/parole-0.2.0.2-dsofix.patch
new file mode 100644
index 0000000..4f9a5dc
--- /dev/null
+++ b/parole-0.2.0.2-dsofix.patch
@@ -0,0 +1,24 @@
+diff -Nur parole-0.2.0.2.orig/browser-plugin/media-plugin/Makefile.in parole-0.2.0.2/browser-plugin/media-plugin/Makefile.in
+--- parole-0.2.0.2.orig/browser-plugin/media-plugin/Makefile.in	2010-01-25 04:47:24.000000000 -0700
++++ parole-0.2.0.2/browser-plugin/media-plugin/Makefile.in	2010-02-18 15:16:52.000000000 -0700
+@@ -198,7 +198,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 -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-0.2.0.2-libnotify.patch b/parole-0.2.0.2-libnotify.patch
new file mode 100644
index 0000000..5f8ecac
--- /dev/null
+++ b/parole-0.2.0.2-libnotify.patch
@@ -0,0 +1,16 @@
+diff -Nur parole-0.2.0.2.orig/plugins/tray/tray-provider.c parole-0.2.0.2/plugins/tray/tray-provider.c
+--- parole-0.2.0.2.orig/plugins/tray/tray-provider.c	2010-01-25 04:22:07.000000000 -0700
++++ parole-0.2.0.2/plugins/tray/tray-provider.c	2010-11-05 16:51:49.170270398 -0600
+@@ -261,7 +261,7 @@
+     
+     message = g_strdup_printf ("%s %s %s %s", _("<b>Playing:</b>"), title, _("<b>Duration:</b>"), timestring);
+     
+-    tray->n = notify_notification_new (title, message, NULL, NULL);
++    tray->n = notify_notification_new (title, message, NULL);
+     g_free (title);
+     g_free (message);
+     
+-    notify_notification_attach_to_status_icon (tray->n, tray->tray);
+     pix = xfce_themed_icon_load (has_video ? "video" : "audio-x-generic", 48);
+     if ( pix )
+     {
diff --git a/parole.spec b/parole.spec
index 5566b67..c0be307 100644
--- a/parole.spec
+++ b/parole.spec
@@ -2,17 +2,23 @@
 
 %global minorversion 0.2
 
+# by default build the browser plugin
+# use bcond_with to change the default
+%bcond_without mozilla
+
 Name:           parole
-Version:        0.2.0.6
-Release:        3%{?dist}
+Version:        0.2.0.2
+Release:        7%{?dist}
 Summary:        Media player for the Xfce desktop
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
+#VCS git:git://git.xfce.org/apps/parole
 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.6-dsofix.patch
+Patch1:         parole-0.2.0.2-dsofix.patch
+Patch2:         parole-0.2.0.2-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -25,10 +31,11 @@ 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 
@@ -42,6 +49,19 @@ 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
@@ -54,8 +74,10 @@ The %{name}-devel package contains header files for developing plugins for
 
 %prep
 %setup -q
-%patch1 -p1 
-
+%patch1 -p1 -b .dso
+%if 0%{?fedora} >= 15
+%patch2 -p1 -b .libnotify-0.7
+%endif
 
 %build
 %configure --disable-static --enable-gtk-doc \
@@ -112,6 +134,14 @@ 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/
@@ -119,16 +149,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.2.0.6-2
-- Rebuild for new libpng
-
-* 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
+* Sat Oct 20 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0.2-7
+- Fix tray icon plugin (#756495)
+- Add VCS key
 
 * 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

More information about the scm-commits mailing list