client/rhel/rhn-client-tools/data/Makefile | 33 ++++++++-- client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png |binary client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 + 8 files changed, 31 insertions(+), 6 deletions(-)
New commits: commit 48280bff0c61e90db416372dd756c319b6c262d6 Author: Milan Zazrivec mzazrivec@redhat.com Date: Mon Dec 9 14:28:01 2013 +0100
1037778 - new registration icons
diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile index 534c93f..4b833a4 100644 --- a/client/rhel/rhn-client-tools/data/Makefile +++ b/client/rhel/rhn-client-tools/data/Makefile @@ -7,17 +7,29 @@ GLADES = gui.glade progress.glade rh_register.glade PUPLET_SS = puplet-screenshot.png KEYS = RHNS-CA-CERT
+# Distro +RHEL = $(shell rpm --eval 0%{?rhel}) +FEDORA = $(shell rpm --eval 0%{?fedora}) + # Directories for installation RHNSHARE_DIR = $(PREFIX)/usr/share/rhn PIXMAP_DIR = $(PREFIX)/usr/share/pixmaps PNG16_DIR = $(PREFIX)/usr/share/icons/hicolor/16x16/apps +PNG22_DIR = $(PREFIX)/usr/share/icons/hicolor/22x22/apps PNG24_DIR = $(PREFIX)/usr/share/icons/hicolor/24x24/apps PNG32_DIR = $(PREFIX)/usr/share/icons/hicolor/32x32/apps PNG48_DIR = $(PREFIX)/usr/share/icons/hicolor/48x48/apps +PNG256_DIR = $(PREFIX)/usr/share/icons/hicolor/256x256/apps # all dirs +ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newicons"), newicons) +DIRS = $(PIXMAP_DIR) \ + $(PNG16_DIR) $(PNG22_DIR) $(PNG24_DIR) $(PNG32_DIR) $(PNG48_DIR) $(PNG256_DIR) \ + $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client +else DIRS = $(PIXMAP_DIR) \ $(PNG16_DIR) $(PNG24_DIR) $(PNG32_DIR) $(PNG48_DIR) \ - $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client \ + $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client +endif
# INSTALL scripts INSTALL = install -p --verbose @@ -56,11 +68,20 @@ install:: $(DIRS) $(INSTALL_DATA) $(GLADES) $(RHNSHARE_DIR)/up2date_client
- # install the hicolor theme icons for up2date - $(INSTALL_DATA) up2date-icons/16x16/up2date.png $(PNG16_DIR)/ - $(INSTALL_DATA) up2date-icons/24x24/up2date.png $(PNG24_DIR)/ - $(INSTALL_DATA) up2date-icons/32x32/up2date.png $(PNG32_DIR)/ - $(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/ +# install the hicolor theme icons for up2date +ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newicons"), newicons) + $(INSTALL_DATA) up2date-icons-new/16x16/up2date.png $(PNG16_DIR)/ + $(INSTALL_DATA) up2date-icons-new/22x22/up2date.png $(PNG22_DIR)/ + $(INSTALL_DATA) up2date-icons-new/24x24/up2date.png $(PNG24_DIR)/ + $(INSTALL_DATA) up2date-icons-new/32x32/up2date.png $(PNG32_DIR)/ + $(INSTALL_DATA) up2date-icons-new/48x48/up2date.png $(PNG48_DIR)/ + $(INSTALL_DATA) up2date-icons-new/256x256/up2date.png $(PNG256_DIR)/ +else + $(INSTALL_DATA) up2date-icons/16x16/up2date.png $(PNG16_DIR)/ + $(INSTALL_DATA) up2date-icons/24x24/up2date.png $(PNG24_DIR)/ + $(INSTALL_DATA) up2date-icons/32x32/up2date.png $(PNG32_DIR)/ + $(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/ +endif
# this is lame and should be dealt with in the code sed -i -e "s|@@logo@@|$(LOGO)|g" \ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png new file mode 100644 index 0000000..b96c682 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png new file mode 100644 index 0000000..ddbd1ea Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png new file mode 100644 index 0000000..549c13d Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png new file mode 100644 index 0000000..fab66a4 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png new file mode 100644 index 0000000..627b1c4 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png new file mode 100644 index 0000000..5beb1f0 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png differ diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index d73f5b6..11f2ea0 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -313,6 +313,10 @@ make -f Makefile.rhn-client-tools test %{_datadir}/icons/hicolor/24x24/apps/up2date.png %{_datadir}/icons/hicolor/32x32/apps/up2date.png %{_datadir}/icons/hicolor/48x48/apps/up2date.png +%if 0%{?rhel} > 6 || 0%{?fedora} > 17 +%{_datadir}/icons/hicolor/22x22/apps/up2date.png +%{_datadir}/icons/hicolor/256x256/apps/up2date.png +%endif %{_datadir}/applications/rhn_register.desktop
%if 0%{?rhel} > 0 && 0%{?rhel} < 6
spacewalk-commits@lists.fedorahosted.org