client/rhel/rhn-client-tools/data/Makefile | 19 +++++++++++----
client/rhel/rhn-client-tools/data/gui.glade | 16 ++++++------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 +++++
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2 -
4 files changed, 31 insertions(+), 13 deletions(-)
New commits:
commit 8c3dfa382410941995ca798e85343a30ada1bdb2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 24 15:12:44 2010 +0200
We don't need hwdata target anymore
This is to avoid build errors:
make[2]: *** No rule to make target `hwdata.py', needed by `all'. Stop.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index 876ba03..6f060e7 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -4,7 +4,7 @@
# rhn-client-tools and not here.
FILES := config gui hardware progress \
- haltree hardware_hal hardware_gudev hwdata \
+ haltree hardware_hal hardware_gudev \
up2dateUtils getMethod tui \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
commit c9ff354a333b038ffa5e86014072cbeebcb2e6ee
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 24 15:12:25 2010 +0200
580493 - use correct product logos in rhn_register (gui)
diff --git a/client/rhel/rhn-client-tools/data/Makefile
b/client/rhel/rhn-client-tools/data/Makefile
index 427fd24..bbbbc6f 100644
--- a/client/rhel/rhn-client-tools/data/Makefile
+++ b/client/rhel/rhn-client-tools/data/Makefile
@@ -25,9 +25,20 @@ INSTALL = install -p --verbose
INSTALL_DIR = $(INSTALL) -m 755 -d
INSTALL_DATA = $(INSTALL) -m 644
-# Handy defines
-PIXMAPS = /usr/share/firstboot/pixmaps/
-SHADOWMAN = shadowman-round-48.png
+# Fedora
+ifeq ($(shell test -f /usr/share/icons/hicolor/48x48/apps/fedora-logo-icon.png &&
echo "exists" ), exists)
+LOGO = /usr/share/icons/hicolor/48x48/apps/fedora-logo-icon.png
+endif
+
+# RHEL-5
+ifeq ($(shell test -f /usr/share/pixmaps/redhat/shadowman-round-48.png && echo
"exists" ), exists)
+LOGO = /usr/share/pixmaps/redhat/shadowman-round-48.png
+endif
+
+# RHEL-6
+ifeq ($(shell test -f /usr/share/icons/hicolor/48x48/apps/system-logo-icon.png &&
echo "exists" ), exists)
+LOGO = /usr/share/icons/hicolor/48x48/apps/system-logo-icon.png
+endif
# For subdirs, required exports
@@ -48,7 +59,7 @@ install:: $(DIRS)
$(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/
# this is lame and should be dealt with in the code
- sed -i -e "s|$(SHADOWMAN)|$(PIXMAPS)/$(SHADOWMAN)|g" \
+ sed -i -e "s|@@logo@@|$(LOGO)|g" \
$(RHNSHARE_DIR)/up2date_client/*glade
# This sucks. We should be able to use PIXMAP_DIR, but then when making
# an rpm prefix is set to something different than where it'll be when
diff --git a/client/rhel/rhn-client-tools/data/gui.glade
b/client/rhel/rhn-client-tools/data/gui.glade
index cf2cacc..af92d0f 100644
--- a/client/rhel/rhn-client-tools/data/gui.glade
+++ b/client/rhel/rhn-client-tools/data/gui.glade
@@ -33,7 +33,7 @@
<widget class="GnomeDruidPageStandard" id="startPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Registering for
software updates</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onStartPageNext"/>
<signal name="prepare" handler="onStartPagePrepare"/>
@@ -56,7 +56,7 @@
<widget class="GnomeDruidPageStandard" id="chooseServerPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Choose an update
location</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onChooseServerPageNext"/>
<signal name="back" handler="onChooseServerPageBack"/>
<signal name="prepare"
handler="onChooseServerPagePrepare"/>
@@ -80,7 +80,7 @@
<widget class="GnomeDruidPageStandard" id="loginPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Enter your account
information</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onLoginPageNext"/>
<signal name="back" handler="onLoginPageBack"/>
<signal name="prepare" handler="onLoginPagePrepare"/>
@@ -104,7 +104,7 @@
<widget class="GnomeDruidPageStandard"
id="chooseChannelPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Select operating
system release</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onChooseChannelPageNext"
last_modification_time="Fri, 22 Jun 2007 16:04:40 GMT"/>
<signal name="back" handler="onChooseChannelPageBack"
last_modification_time="Fri, 22 Jun 2007 16:05:05 GMT"/>
<signal name="prepare" handler="onChooseChannelPagePrepare"
last_modification_time="Fri, 22 Jun 2007 18:48:33 GMT"/>
@@ -128,7 +128,7 @@
<widget class="GnomeDruidPageStandard"
id="createProfilePage">
<property name="visible">True</property>
<property name="title" translatable="yes">Create your system
profile</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onCreateProfilePageNext"/>
<signal name="back" handler="onCreateProfilePageBack"/>
<signal name="prepare"
handler="onCreateProfilePagePrepare"/>
@@ -152,7 +152,7 @@
<widget class="GnomeDruidPageStandard"
id="reviewSubscriptionPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Review system
subscription details</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next"
handler="onReviewSubscriptionPageNext"/>
<signal name="prepare"
handler="onReviewSubscriptionPagePrepare"/>
@@ -175,7 +175,7 @@
<widget class="GnomeDruidPageStandard"
id="provideCertificatePage">
<property name="visible">True</property>
<property name="title" translatable="yes">Provide a security
certificate</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next"
handler="onProvideCertificatePageNext"/>
<signal name="back"
handler="onProvideCertificatePageBack"/>
@@ -198,7 +198,7 @@
<widget class="GnomeDruidPageStandard" id="finishPage">
<property name="visible">True</property>
<property name="title" translatable="yes"></property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="finish" handler="onFinishPageFinish"/>
<signal name="prepare" handler="onFinishPagePrepare"/>
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d84b63b..25c8dc0 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -36,6 +36,13 @@ BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
+BuildRequires: fedora-logos
+%endif
+%if 0%{?rhel} > 4
+BuildRequires: redhat-logos
+%endif
+
# The following BuildRequires are for check only
%if 0%{?fedora} >= 12
BuildRequires: python-coverage
Show replies by date