nonamedotc pushed to xfce4-mpc-plugin (epel7). "Patch for xfce4-panel 4.8 (bugzilla.xfce-org #6623) (..more)"

[notifications at fedoraproject.org]

>From 78859971bafbccbe7840506fa403a0432380868f Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sun, 6 Mar 2011 01:06:14 +0100
Subject: Patch for xfce4-panel 4.8 (bugzilla.xfce-org #6623) Update icon-cache
 scriptlets


diff --git a/xfce4-mpc-plugin-0.3.5-exo-and-libxfcegui4.patch b/xfce4-mpc-plugin-0.3.5-exo-and-libxfcegui4.patch
new file mode 100644
index 0000000..7e294be
--- /dev/null
+++ b/xfce4-mpc-plugin-0.3.5-exo-and-libxfcegui4.patch
@@ -0,0 +1,33 @@
+diff -ur xfce4-mpc-plugin-0.3.5.orig/configure.ac xfce4-mpc-plugin-0.3.5/configure.ac
+--- xfce4-mpc-plugin-0.3.5.orig/configure.ac	2010-05-17 22:05:35.000000000 +0300
++++ xfce4-mpc-plugin-0.3.5/configure.ac	2010-08-09 15:47:08.000000000 +0300
+@@ -40,7 +40,9 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
+-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22])
++XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1], [],
++  [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])])
+ 
+ dnl check for libmpd presence
+ AC_ARG_WITH(libmpd,
+diff -ur xfce4-mpc-plugin-0.3.5.orig/panel-plugin/Makefile.am xfce4-mpc-plugin-0.3.5/panel-plugin/Makefile.am
+--- xfce4-mpc-plugin-0.3.5.orig/panel-plugin/Makefile.am	2009-08-17 22:36:34.000000000 +0300
++++ xfce4-mpc-plugin-0.3.5/panel-plugin/Makefile.am	2010-08-09 15:47:44.000000000 +0300
+@@ -4,11 +4,13 @@
+ xfce4_mpc_plugin_CFLAGS =						\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+ 	@EXO_CFLAGS@							\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@						\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_mpc_plugin_LDADD =						\
+ 	@EXO_LIBS@							\
+-	@LIBXFCE4PANEL_LIBS@
++	@LIBXFCE4PANEL_LIBS@						\
++	@LIBXFCEGUI4_LIBS@
+ 
+ 
+ xfce4_mpc_plugin_SOURCES = xfce4-mpc-plugin.c xfce4-mpc-plugin.h
diff --git a/xfce4-mpc-plugin.spec b/xfce4-mpc-plugin.spec
index 5887fc3..37adc08 100644
--- a/xfce4-mpc-plugin.spec
+++ b/xfce4-mpc-plugin.spec
@@ -9,12 +9,16 @@ Group:          User Interface/Desktops
 License:        ISC
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2
+# http://bugzilla.xfce.org/show_bug.cgi?id=6623
+Patch0:         xfce4-mpc-plugin-0.3.5-exo-and-libxfcegui4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.90.2
 BuildRequires:  exo-devel >= 0.3.1.1
 BuildRequires:  gettext, intltool
 BuildRequires:  libmpd-devel >= 0.12
+# because of Patch0
+BuildRequires:  xfce4-dev-tools
 Requires:       xfce4-panel >= 4.6.0
 
 %description
@@ -23,32 +27,38 @@ A simple client plugin for MPD, the Music Player Daemon.
 
 %prep
 %setup -q
+%patch0 -p1 -b .exo-and-libxfcegui4.patch
 
 
 %build
-%configure --disable-static
+# because of Patch0
+NOCONFIGURE=1 xdt-autogen
+
+%configure
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 06 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.5-3
+- Patch for xfce4-panel 4.8 (bugzilla.xfce-org #6623)
+- Update icon-cache scriptlets
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xfce4-mpc-plugin.git/commit/?h=epel7&id=78859971bafbccbe7840506fa403a0432380868f