client/rhel/rhn-client-tools/man/Makefile | 2
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +
client/rhel/rhnlib/rhnlib.spec | 4 -
client/rhel/rhnsd/man/Makefile | 2
client/rhel/yum-rhn-plugin/actions/Makefile | 2
client/rhel/yum-rhn-plugin/po/no.po | 81 ---------------------
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2
7 files changed, 14 insertions(+), 85 deletions(-)
New commits:
commit 398907e4785f218198fbb8717338cce3ded8a033
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 3 11:18:02 2009 +0100
suse has its own macro for updating icons
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 0634c35..57f05d7 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -9,6 +9,7 @@ Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?suse_version: %{suse_version} > 1000} %{!?suse_version:1}
BuildArch: noarch
+BuildRequires: update-desktop-files
%endif
Requires: rhnlib >= 2.2.7
@@ -81,6 +82,9 @@ 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}%{_datadir}/applications --vendor=rhn
rhn_register.desktop
+%if 0%{?suse_version}
+%suse_update_desktop_file rhn_register System
+%endif
%find_lang %{name}
commit 0a40b66a79c3b2f272c50c2b20f151fecbc2075d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 3 11:16:04 2009 +0100
enable build for suse 10.00 too
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 7cf28f4..0634c35 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -7,7 +7,7 @@ Name: rhn-client-tools
Version: 0.7.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
+%if %{?suse_version: %{suse_version} > 1000} %{!?suse_version:1}
BuildArch: noarch
%endif
commit 080c025b76bd3ea43f00eacd4b5a9c6651b6f2e9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Sun Nov 1 23:07:26 2009 +0100
remove no.po as Norwegian translation is for some time in nb.po, which is correct
location anyway
diff --git a/client/rhel/yum-rhn-plugin/po/no.po b/client/rhel/yum-rhn-plugin/po/no.po
deleted file mode 100644
index 8bf7a43..0000000
--- a/client/rhel/yum-rhn-plugin/po/no.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:39-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../rhnplugin.py:41
-msgid "There was an error communicating with RHN."
-msgstr ""
-
-#: ../rhnplugin.py:63
-msgid "RHN support will be disabled."
-msgstr ""
-
-#. If non-root notify user RHN repo not accessible
-#: ../rhnplugin.py:75
-msgid ""
-"*Note* Red Hat Network repositories are not listed below. You must run this "
-"command as root to access RHN repositories."
-msgstr ""
-
-#: ../rhnplugin.py:89
-msgid "There was an error parsing the RHN proxy settings."
-msgstr ""
-
-#: ../rhnplugin.py:100
-msgid "Cleaning"
-msgstr ""
-
-#: ../rhnplugin.py:106
-msgid "Either --version, or no commands entered"
-msgstr ""
-
-#: ../rhnplugin.py:120
-msgid "This system is not registered with RHN."
-msgstr ""
-
-#: ../rhnplugin.py:125
-msgid "RHN channel support will be disabled."
-msgstr ""
-
-#: ../rhnplugin.py:129
-msgid "This system is not subscribed to any channels."
-msgstr ""
-
-#: ../rhnplugin.py:133
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be
acquired.\n"
-msgstr ""
-
-#: ../rhnplugin.py:202
-msgid "Package profile information could not be sent."
-msgstr ""
-
-#. This is compensating for hosted/satellite returning back an error
-#. message instructing RHEL5 clients to run "up2date --register"
-#. bz: 438175
-#: ../rhnplugin.py:209
-msgid "Error Message:"
-msgstr ""
-
-#: ../rhnplugin.py:210
-msgid "Please run rhn_register as root on this client"
-msgstr ""
-
-#: ../rhnplugin.py:286
-#, python-format
-msgid "Missing required login information for RHN: %s"
-msgstr ""
commit dd56f51ceb384bbffafc743d663b2b48ab8abe39
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Sun Nov 1 22:48:36 2009 +0100
remove double slash, Mandriva do not likes it
diff --git a/client/rhel/yum-rhn-plugin/actions/Makefile
b/client/rhel/yum-rhn-plugin/actions/Makefile
index e9367a3..80d4cd9 100644
--- a/client/rhel/yum-rhn-plugin/actions/Makefile
+++ b/client/rhel/yum-rhn-plugin/actions/Makefile
@@ -2,7 +2,7 @@ PREFIX ?= /
PYTHON ?= python
PYFILES = $(wildcard *.py)
-PKGDIR = /usr/share/rhn/actions/
+PKGDIR = usr/share/rhn/actions/
all:
echo "Nothing to do"
commit 489937ec4b85f7cbeea2be6d2b7f683b3fe0d89c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Sep 10 12:22:54 2009 +0200
remove leading whitespace. rpm will treat this as unknown tag
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 74a9b7b..1a4ce36 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -12,7 +12,7 @@ License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
- BuildArch: noarch
+BuildArch: noarch
%endif
BuildRequires: python-devel
commit 64fa3a02863d9ec8a95af4e4202ce5aeb5da8a63
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 9 14:37:16 2009 +0200
fix build under opensuse
python libraries in suse could not be noarch
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 342f849..ff6569a 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -7,7 +7,9 @@ Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
BuildArch: noarch
+%endif
BuildRequires: python
BuildRequires: intltool
BuildRequires: gettext
commit 750a771df4e0adce417f359a9c10de9c0e728a04
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 9 12:54:33 2009 +0200
hardcode MANPATH
if MANPATH contain something else, like /usr/local/man:/usr/share/man it will not
work.
So stop pretending, that we can work with something else.
diff --git a/client/rhel/rhn-client-tools/man/Makefile
b/client/rhel/rhn-client-tools/man/Makefile
index b0245c6..21fc2b8 100644
--- a/client/rhel/rhn-client-tools/man/Makefile
+++ b/client/rhel/rhn-client-tools/man/Makefile
@@ -10,7 +10,7 @@ INSTALL_DATA = $(INSTALL) -m 644
all :
-MANPATH ?= /usr/share/man
+MANPATH = /usr/share/man
MANDIR = $(PREFIX)/$(MANPATH)
CAT = 8 5
LANGDIR =
commit 853461bde34f3380fe5fe2100df0446ab3bf1a59
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 9 11:37:52 2009 +0200
fix build under opensuse
python libraries in suse could not be noarch
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 008993d..7cf28f4 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -7,7 +7,9 @@ Name: rhn-client-tools
Version: 0.7.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
BuildArch: noarch
+%endif
Requires: rhnlib >= 2.2.7
Requires: rpm >= 4.2.3-24_nonptl
commit 2c801b89f33675f90490ed03fd2d50803f434ddb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 9 11:28:02 2009 +0200
hardcode MANPATH
if MANPATH contain something else, like /usr/local/man:/usr/share/man it will not
work.
So stop pretending, that we can work with something else.
diff --git a/client/rhel/rhnsd/man/Makefile b/client/rhel/rhnsd/man/Makefile
index 2099c36..388d9d5 100644
--- a/client/rhel/rhnsd/man/Makefile
+++ b/client/rhel/rhnsd/man/Makefile
@@ -10,7 +10,7 @@ INSTALL_DATA = $(INSTALL) -m 644
all :
-MANPATH ?= /usr/share/man
+MANPATH = /usr/share/man
MANDIR = $(PREFIX)/$(MANPATH)
CAT = 8
LANGDIR =
commit 8549ec672471e4f7a9786b3df6e028d782d0222e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 8 19:28:16 2009 +0200
fix build under opensuse
python libraries in suse could not be noarch
say to install to /usr, otherwise suse will install to /usr/local
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index a1af646..74a9b7b 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -11,7 +11,9 @@ Group: Development/Libraries
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
+ BuildArch: noarch
+%endif
BuildRequires: python-devel
Requires: pyOpenSSL
@@ -38,7 +40,7 @@ make -f Makefile.rhnlib
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
%clean