diff options
author | Wolfram Schlich <wschlich@gentoo.org> | 2007-02-28 19:37:12 +0000 |
---|---|---|
committer | Wolfram Schlich <wschlich@gentoo.org> | 2007-02-28 19:37:12 +0000 |
commit | fdd1c99060fc73b3c4cc46acc05a76a67b2b323b (patch) | |
tree | 3cdc7b88d5c475535d2fbaeae095ebf8790eee77 /app-backup/bacula | |
parent | Fixups for suspend2-2.6.19, bug#168728, thanks to Ákos Maróy (diff) | |
download | gentoo-2-fdd1c99060fc73b3c4cc46acc05a76a67b2b323b.tar.gz gentoo-2-fdd1c99060fc73b3c4cc46acc05a76a67b2b323b.tar.bz2 gentoo-2-fdd1c99060fc73b3c4cc46acc05a76a67b2b323b.zip |
move from gnomesu to gksu wrt bug #147550
(Portage version: 2.1.2)
Diffstat (limited to 'app-backup/bacula')
-rw-r--r-- | app-backup/bacula/ChangeLog | 6 | ||||
-rw-r--r-- | app-backup/bacula/bacula-2.0.2.ebuild | 21 | ||||
-rw-r--r-- | app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff | 36 |
3 files changed, 51 insertions, 12 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog index 48b9d7fd6250..6592d4d6f107 100644 --- a/app-backup/bacula/ChangeLog +++ b/app-backup/bacula/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/bacula # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.22 2007/02/28 14:40:44 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.23 2007/02/28 19:37:12 wschlich Exp $ + + 28 Feb 2007; Wolfram Schlich <wschlich@gentoo.org> + +files/bacula-2.0.2-gnomesu2gksu.diff, bacula-2.0.2.ebuild: + move from gnomesu to gksu wrt bug #147550 *bacula-2.0.2 (28 Feb 2007) diff --git a/app-backup/bacula/bacula-2.0.2.ebuild b/app-backup/bacula/bacula-2.0.2.ebuild index 8681d203b52e..fc679e3cfc1c 100644 --- a/app-backup/bacula/bacula-2.0.2.ebuild +++ b/app-backup/bacula/bacula-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.0.2.ebuild,v 1.1 2007/02/28 14:40:44 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.0.2.ebuild,v 1.2 2007/02/28 19:37:12 wschlich Exp $ # # TODO: @@ -14,6 +14,7 @@ # - examples/reports/baculareport.pl # - correctly filter unneeded /usr/libexec/bacula/ stuff depending # on selected USE flags, e.g. bacula-clientonly +# - install bacula-web and/or bweb from bacula-gui # inherit eutils @@ -45,7 +46,7 @@ DEPEND=" wxwindows? ( >=x11-libs/wxGTK-2.4.2 ) gnome? ( >=gnome-base/libgnome-2 - app-admin/gnomesu + x11-libs/gksu ) ) ssl? ( dev-libs/openssl ) @@ -122,6 +123,9 @@ src_unpack() { # adjusts default configuration files for several binaries # to /etc/bacula/<config> instead of ./<config> pushd src && epatch "${FILESDIR}/${P}"-default-configs.patch && popd + + # replaces (deprecated) gnomesu with gksu in the gnome menu files + useq bacula-console && useq gnome && epatch "${FILESDIR}/${P}"-gnomesu2gksu.diff } src_compile() { @@ -200,21 +204,16 @@ src_install() { mv static-bacula-dir bacula-dir mv static-bacula-sd bacula-sd fi - if useq gnome; then + if useq bacula-console && useq gnome; then mv static-gnome-console gnome-console fi popd fi - # gnome menu files + # gnome-console menu entries using gksu if useq bacula-console && useq gnome; then - emake DESTDIR="${D}" \ - install-menu \ - install-menu-xsu || die "Failed to install gnome menu files" \ - make_desktop_entry \ - "gnome-console -c /etc/bacula/gnome-console.conf" \ - "Bacula Console" /usr/share/pixmaps/bacula.png "app-admin" \ - "/usr/sbin" + emake DESTDIR="${D}" install-menu-xsu \ + || die "Failed to install gnome menu files" fi # extra files which 'make install' doesn't cover diff --git a/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff b/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff new file mode 100644 index 000000000000..015ad5940eaf --- /dev/null +++ b/app-backup/bacula/files/bacula-2.0.2-gnomesu2gksu.diff @@ -0,0 +1,36 @@ +diff -urN scripts/bacula.desktop.gnome1.xsu.in scripts/bacula.desktop.gnome1.xsu.in +--- scripts/bacula.desktop.gnome1.xsu.in 2004-03-28 19:08:45.000000000 +0200 ++++ scripts/bacula.desktop.gnome1.xsu.in 2007-02-28 16:36:14.000000000 +0100 +@@ -2,7 +2,7 @@ + Name=Bacula Console + Comment=Bacula Director Console + Icon=/usr/share/pixmaps/bacula.png +-Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." ++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" + Terminal=false + Type=Application + Encoding=UTF-8 +diff -urN scripts/bacula.desktop.gnome2.xsu.in scripts/bacula.desktop.gnome2.xsu.in +--- scripts/bacula.desktop.gnome2.xsu.in 2004-03-28 19:08:45.000000000 +0200 ++++ scripts/bacula.desktop.gnome2.xsu.in 2007-02-28 16:36:25.000000000 +0100 +@@ -2,7 +2,7 @@ + Name=Bacula Console + Comment=Bacula Director Console + Icon=/usr/share/pixmaps/bacula.png +-Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." ++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" + Terminal=false + Type=Application + Encoding=UTF-8 +diff -urN scripts/wxconsole.desktop.xsu.in scripts/wxconsole.desktop.xsu.in +--- scripts/wxconsole.desktop.xsu.in 2006-04-16 18:01:52.000000000 +0200 ++++ scripts/wxconsole.desktop.xsu.in 2007-02-28 16:35:25.000000000 +0100 +@@ -2,7 +2,7 @@ + Name=Bacula WX Console + Comment=Bacula Director Console + Icon=/usr/share/pixmaps/wxwin16x16.xpm +-Exec=gnomesu -t "Query" -c "@sbindir@/wxconsole -c @sysconfdir@/wxconsole.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required." ++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/wxconsole -c @sysconfdir@/wxconsole.conf" + Terminal=false + Type=Application + Encoding=UTF-8 |