client/rhel/rhn-client-tools/etc-conf/Makefile | 5 ++++-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 14 +++++++++++++-
client/rhel/rhn-client-tools/rhn_register.desktop | 10 ++++++++++
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 73e7fd971625d652626a22b73200f92d2168f22e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Mar 30 13:39:28 2009 +0200
Automatic commit of package [rhn-client-tools] release [0.4.23-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 249a4bc..699072c 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -5,7 +5,7 @@ Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.
Source1: rhn_register.desktop
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.4.22
+Version: 0.4.23
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -205,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/rhn_register.desktop
%changelog
-* Mon Mar 30 2009 Miroslav Suchy <msuchy(a)redhat.com>
+* Mon Mar 30 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.4.23-1
- 490438 - add .desktop file, own allowed-actions dir
* Mon Mar 16 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.4.22-1
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 1b32b45..8fd0126 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.4.22-1 client/rhel/rhn-client-tools/
+0.4.23-1 client/rhel/rhn-client-tools/
commit 0cd6ea34fccb64cc380962750bbd5fe8632562c6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Mar 30 13:38:06 2009 +0200
490438 - own allowed-actions dir
diff --git a/client/rhel/rhn-client-tools/etc-conf/Makefile
b/client/rhel/rhn-client-tools/etc-conf/Makefile
index f90bf9a..544d0f8 100644
--- a/client/rhel/rhn-client-tools/etc-conf/Makefile
+++ b/client/rhel/rhn-client-tools/etc-conf/Makefile
@@ -13,13 +13,16 @@ SECURITY_DIR = $(PREFIX)/etc/security/console.apps
CONFIG_DIR = $(PREFIX)/etc/sysconfig/rhn
MACROS_DIR = $(PREFIX)/etc/rpm/
CAPS_DIR = $(PREFIX)/etc/sysconfig/rhn/clientCaps.d
+ALLOWED_ACTIONS_SCRIPT = $(PREFIX)/etc/sysconfig/rhn/allowed-actions/script
+ALLOWED_ACTIONS_CONFIG = $(PREFIX)/etc/sysconfig/rhn/allowed-actions/configfiles
LOGROTATE_DIR = $(PREFIX)/etc/logrotate.d
YUM_REPO_DIR = $(PREFIX)/etc/yum.repos.d
# all dirs
DIRS = $(PAMD_DIR) $(SECURITY_DIR) $(CONFIG_DIR) \
$(LOGROTATE_DIR) $(YUM_REPO_DIR)\
- $(MACROS_DIR) $(CAPS_DIR)
+ $(MACROS_DIR) $(CAPS_DIR) $(ALLOWED_ACTIONS_SCRIPT) \
+ $(ALLOWED_ACTIONS_CONFIG)
# INSTALL scripts
INSTALL = install -p --verbose
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d77e267..249a4bc 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/sysconfig/rhn
%dir %{_sysconfdir}/sysconfig/rhn/clientCaps.d
+%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions
+%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/configfiles
+%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/script
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
%config(noreplace) %{_sysconfdir}/logrotate.d/up2date
%config(noreplace) %{_sysconfdir}/rpm/macros.up2date
@@ -203,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Mar 30 2009 Miroslav Suchy <msuchy(a)redhat.com>
-- 490438 - add .desktop file
+- 490438 - add .desktop file, own allowed-actions dir
* Mon Mar 16 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.4.22-1
- use macros insted hardcoded paths
commit 1d7459a75ee53596a87140760892aea0027e304d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Mar 30 12:27:40 2009 +0200
490438 - add .desktop file
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 7e885e1..d77e267 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -2,6 +2,7 @@ Summary: Support programs and libraries for Red Hat Network or Spacewalk
License: GPLv2
Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+Source1: rhn_register.desktop
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
Version: 0.4.22
@@ -25,6 +26,7 @@ Conflicts: up2date
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: intltool
+BuildRequires: desktop-file-utils
%description
Red Hat Network Client Tools provides programs and libraries to allow your
@@ -77,9 +79,12 @@ make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release}
PREFIX=$
mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_desktopdir} --vendor=rhn %{SOURCE1}
+
%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -194,8 +199,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/24x24/apps/up2date.png
%{_datadir}/icons/hicolor/32x32/apps/up2date.png
%{_datadir}/icons/hicolor/48x48/apps/up2date.png
+%{_desktopdir}/rhn_register.desktop
%changelog
+* Mon Mar 30 2009 Miroslav Suchy <msuchy(a)redhat.com>
+- 490438 - add .desktop file
+
* Mon Mar 16 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.4.22-1
- use macros insted hardcoded paths
diff --git a/client/rhel/rhn-client-tools/rhn_register.desktop
b/client/rhel/rhn-client-tools/rhn_register.desktop
new file mode 100644
index 0000000..d8f5240
--- /dev/null
+++ b/client/rhel/rhn-client-tools/rhn_register.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=rhn_register
+GenericName=Registering for software updated
+Comment=Register to Spacewalk/Satellite/Red Hat Network.
+Exec=rhn_register
+Icon=up2date
+Terminal=false
+Type=Application
+Categories=Settings;