[beesu] check for pluma in caja-beesu-manager

Tom Callaway spot at fedoraproject.org
Mon Apr 7 17:55:22 UTC 2014


commit 10f7132b9a009b09bf433ee2d1f71ab43efb8875
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Apr 7 13:55:16 2014 -0400

    check for pluma in caja-beesu-manager

 beesu.spec                         |   11 ++++++++++-
 caja-beesu-manager-pluma-fix.patch |   14 ++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/beesu.spec b/beesu.spec
index 5ab03ab..fd26d9c 100644
--- a/beesu.spec
+++ b/beesu.spec
@@ -5,7 +5,7 @@ Name: beesu
 Version: 2.7
 # Don't ever decrease this version (unless all beesu, nbm, and gbp update) or the subpackages will go backwards.
 # It is easier to do this than to track a separate release field.
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -20,6 +20,8 @@ Patch0:  beesu-gedit-plugin-fix.patch
 Patch1:  beesu-gedit-plugin-more-fixes.patch
 Patch2:  beesu-nautilus-scripts-fixes.patch
 Patch3:  beesu-nemo-scripts-fixes.patch
+Patch4:  gedit-plugin-3.12.patch
+Patch5:  caja-beesu-manager-pluma-fix.patch
 BuildRequires: desktop-file-utils
 Requires: pam, usermode, usermode-gtk
 
@@ -64,6 +66,7 @@ files as root (via beesu).
 %package -n caja-beesu-manager
 Version:	%{nbmversion}
 Requires:	beesu, zenity, caja
+Requires:	/usr/bin/pluma
 BuildArch:	noarch
 Group:		User Interface/Desktops
 Summary:	Utility to add beesu scripts to caja
@@ -91,6 +94,8 @@ to Nemo using beesu to elevate the user's privileges to root.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .gedit312
+%patch5 -p1 
 chmod -x nautilus-beesu-manager-%{nbmversion}/COPYING nautilus-beesu-manager-%{nbmversion}/README
 chmod -x nemo-beesu-manager-%{nbmversion}/COPYING nemo-beesu-manager-%{nbmversion}/README
 chmod -x caja-beesu-manager-%{nbmversion}/COPYING caja-beesu-manager-%{nbmversion}/README
@@ -249,6 +254,10 @@ fi
 %{_libexecdir}/nemo-beesu-manager/
 
 %changelog
+* Mon Apr  7 2014 Tom Callaway <spot at fedoraproject.org>
+- add Requires: /usr/bin/pluma for caja-beesu-manager
+- add explicit check for /usr/bin/pluma in caja-beesu-manager
+
 * Thu Mar 20 2014 Tom Callaway <spot at fedoraproject.org>
 - add support for caja and pluma from D. Charles Pyle
 
diff --git a/caja-beesu-manager-pluma-fix.patch b/caja-beesu-manager-pluma-fix.patch
new file mode 100644
index 0000000..fdec067
--- /dev/null
+++ b/caja-beesu-manager-pluma-fix.patch
@@ -0,0 +1,14 @@
+diff -up beesu-2.7/caja-beesu-manager-1.8/caja-beesu-manager.fix beesu-2.7/caja-beesu-manager-1.8/caja-beesu-manager
+--- beesu-2.7/caja-beesu-manager-1.8/caja-beesu-manager.fix	2014-04-07 13:52:08.839835037 -0400
++++ beesu-2.7/caja-beesu-manager-1.8/caja-beesu-manager	2014-04-07 13:52:42.318610171 -0400
+@@ -1,5 +1,10 @@
+ #!/bin/bash
+ 
++# beesu_requires "mate-text-editor" "mate-text-editor"
++if [ ! -x /usr/bin/pluma ]; then
++    beesu_requires "mate-text-editor" "pluma (or, depending on available package for your Fedora version, beesu - yum install mate-text-editor)"
++fi
++
+ #####
+ 
+ if [ "x$HOME" == "x" ]


More information about the scm-commits mailing list