[beesu] fix gedit plugin
Tom Callaway
spot at fedoraproject.org
Fri Feb 10 21:59:45 UTC 2012
commit 96666fa732988968be9beda4b86956c4ff31fb7f
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Feb 10 16:59:44 2012 -0500
fix gedit plugin
beesu-gedit-plugin-fix.patch | 41 +++++++++++++++++++++++++++++++++++++++++
beesu.spec | 21 +++++++++------------
2 files changed, 50 insertions(+), 12 deletions(-)
---
diff --git a/beesu-gedit-plugin-fix.patch b/beesu-gedit-plugin-fix.patch
new file mode 100644
index 0000000..f844aea
--- /dev/null
+++ b/beesu-gedit-plugin-fix.patch
@@ -0,0 +1,41 @@
+diff -up beesu-2.7/gedit-beesu-plugin-0.4/beesu.gedit-plugin.fix beesu-2.7/gedit-beesu-plugin-0.4/beesu.gedit-plugin
+--- beesu-2.7/gedit-beesu-plugin-0.4/beesu.gedit-plugin.fix 2012-02-10 16:56:07.075334768 -0500
++++ beesu-2.7/gedit-beesu-plugin-0.4/beesu.gedit-plugin 2012-02-10 16:56:13.722268371 -0500
+@@ -1,4 +1,4 @@
+-[Gedit Plugin]
++[Plugin]
+ Loader=python
+ Module=beesu
+ IAge=2
+diff -up beesu-2.7/gedit-beesu-plugin-0.4/Makefile.in.fix beesu-2.7/gedit-beesu-plugin-0.4/Makefile.in
+--- beesu-2.7/gedit-beesu-plugin-0.4/Makefile.in.fix 2010-11-04 16:39:29.000000000 -0400
++++ beesu-2.7/gedit-beesu-plugin-0.4/Makefile.in 2012-02-10 16:54:13.781360974 -0500
+@@ -13,19 +13,19 @@ all:
+
+ # To install things in the right place
+ install:
+- $(MKDIR) -v -p $(LIBDIR)/gedit-2/plugins
+- $(INSTALL) -p -m 644 beesu.gedit-plugin $(LIBDIR)/gedit-2/plugins
+- $(MKDIR) -v -p $(LIBDIR)/gedit-2/plugins/beesu
+- $(INSTALL) -p -m 644 beesu/__init__.py $(LIBDIR)/gedit-2/plugins/beesu
+- $(INSTALL) -p -m 644 beesu/beesu.py $(LIBDIR)/gedit-2/plugins/beesu
++ $(MKDIR) -v -p $(LIBDIR)/gedit/plugins
++ $(INSTALL) -p -m 644 beesu.gedit-plugin $(LIBDIR)/gedit/plugins/beesu.plugin
++ $(MKDIR) -v -p $(LIBDIR)/gedit/plugins/beesu
++ $(INSTALL) -p -m 644 beesu/__init__.py $(LIBDIR)/gedit/plugins/beesu
++ $(INSTALL) -p -m 644 beesu/beesu.py $(LIBDIR)/gedit/plugins/beesu
+ $(MKDIR) -v -p $(LIBEXECDIR)
+ $(INSTALL) -p -m 755 libexec/gedit-beesu-plugin $(LIBEXECDIR)/
+
+ # uninstall
+ uninstall:
+ $(RM) $(LIBEXECDIR)/gedit-beesu-plugin
+- $(RM) $(LIBDIR)/gedit-2/plugins/beesu/beesu.py
+- $(RM) $(LIBDIR)/gedit-2/plugins/beesu/__init__.py
+- $(RM) $(LIBDIR)/gedit-2/plugins/beesu.gedit-plugin
+- $(RMDIR) $(LIBDIR)/gedit-2/plugins/beesu
++ $(RM) $(LIBDIR)/gedit/plugins/beesu/beesu.py
++ $(RM) $(LIBDIR)/gedit/plugins/beesu/__init__.py
++ $(RM) $(LIBDIR)/gedit/plugins/beesu.plugin
++ $(RMDIR) $(LIBDIR)/gedit/plugins/beesu
+
diff --git a/beesu.spec b/beesu.spec
index 87676d7..4f87771 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: 5%{?dist}
+Release: 6%{?dist}
Summary: Graphical wrapper for su
URL: http://www.honeybeenet.altervista.org
Group: Applications/System
@@ -13,7 +13,7 @@ License: GPLv2+
Source0: http://honeybeenet.altervista.org/beesu/files/beesu-sources/%{name}-%{version}.tar.bz2
Source1: http://honeybeenet.altervista.org/beesu/files/beesu-manager/nautilus-beesu-manager-%{nbmversion}.tar.bz2
Source2: http://honeybeenet.altervista.org/beesu/files/beesu-gedit/gedit-beesu-plugin-%{geditver}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: beesu-gedit-plugin-fix.patch
BuildRequires: desktop-file-utils
Requires: pam, usermode
@@ -47,6 +47,7 @@ Open as root.
%prep
%setup -q -a1 -a2
+%patch0 -p1 -b .fix
chmod -x nautilus-beesu-manager-%{nbmversion}/COPYING nautilus-beesu-manager-%{nbmversion}/README
%build
@@ -58,7 +59,6 @@ make CFLAGS="%{optflags}"
popd
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}
make DESTDIR=%{buildroot} install
@@ -80,9 +80,6 @@ pushd gedit-beesu-plugin-%{geditver}
make install
popd
-%clean
-rm -rf %{buildroot}
-
%post -n nautilus-beesu-manager
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null ||:
@@ -103,7 +100,6 @@ fi
%files
-%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
@@ -114,7 +110,6 @@ fi
%{_mandir}/man1/%{name}.1.gz
%files -n nautilus-beesu-manager
-%defattr(-,root,root,-)
%doc nautilus-beesu-manager-%{nbmversion}/COPYING nautilus-beesu-manager-%{nbmversion}/README
%{_bindir}/nautilus-beesu-manager
%{_datadir}/applications/*.desktop
@@ -122,13 +117,15 @@ fi
%{_libexecdir}/nautilus-beesu-manager/
%files -n gedit-beesu-plugin
-%defattr(-,root,root,-)
-%{_libdir}/gedit-2/plugins/beesu.gedit-plugin
-%{_libdir}/gedit-2/plugins/beesu/__init__.py*
-%{_libdir}/gedit-2/plugins/beesu/beesu.py*
+%{_libdir}/gedit/plugins/beesu.plugin
+%{_libdir}/gedit/plugins/beesu/__init__.py*
+%{_libdir}/gedit/plugins/beesu/beesu.py*
%{_libexecdir}/gedit-beesu-plugin
%changelog
+* Fri Feb 10 2012 Tom Callaway <spot at fedoraproject.org> - 2.7-6
+- fix gedit-beesu-plugin (bz 786734)
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list