pool/hplip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 89963 from Printing

Browse Source 
Install hi-res icons and modify categories in hplip.desktop for better appearance in desktop menus (bnc#713902, for openSUSE 12.1)

OBS-URL: https://build.opensuse.org/request/show/89963
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=68
This commit is contained in:
Stephan Kulow 2011-11-07 13:17:53 +00:00 committed by Git OBS Bridge
commit 955437d4df
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hplip.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Oct 28 06:08:53 UTC 2011 - badshah400@gmail.com
- Install icons of various sizes in hicolor icon directory for
better appearance in gnome-shell (bnc#713902).
- Add hicolor-icon-theme BuildRequires to own the hicolor icon
directory correctly and install icons in there
- Use appropriate icon theme macros in post scripts
- Modified hplip.desktop to use these hicolor icons
- In hplip.desktop replace the category "Settings" by "System" to
make it appear under the correct group "System Tools" rather
than "Others" in desktop menus.
-------------------------------------------------------------------
Sat Oct 15 04:47:01 UTC 2011 - coolo@suse.com
- add libtool as buildrequire to make the spec file more reliable
-------------------------------------------------------------------
Thu Oct 13 13:57:46 UTC 2011 - vuntz@opensuse.org

2
hplip.desktop
View File

@ -3,4 +3,4 @@ Type=Application
Name=hp-toolbox
GenericName=HP Device Manager
Exec=hp-toolbox.wrapper
Icon=HPmenu.png
Icon=HPmenu

22
hplip.spec
View File

@ -23,11 +23,13 @@ Name: hplip
# link target doesn't exist (neither in build root nor in installed system):
# /usr/lib/cups/filter/foomatic-rip-hplip -> /usr/bin/foomatic-rip
BuildRequires: cups cups-devel dbus-1-devel fdupes foomatic-filters libdrm-devel libgphoto2-devel libjpeg-devel libqt4-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt4 python-xml readline-devel update-desktop-files
BuildRequires: libtool
%if 0%{?suse_version} > 1130
BuildRequires: sane-backends-devel
%else
BuildRequires: sane-backends
%endif
BuildRequires: hicolor-icon-theme
Summary: HP's Printing, Scanning, and Faxing Software
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
@ -419,13 +421,15 @@ ln -s ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip-hp
install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper
# Install /usr/share/hplip/data/images/64x64/hp_logo.png as desktop icon file
# because it is used in the hplip.desktop.in and hplip-systray.desktop.in sources:
install -d %{buildroot}%{_datadir}/pixmaps
install -m 644 %{buildroot}%{_datadir}/%{name}/data/images/64x64/hp_logo.png %{buildroot}%{_datadir}/pixmaps/HPmenu.png
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/32x32/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/HPmenu.png
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/64x64/hp_logo.png %%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/HPmenu.png
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/128x128/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/HPmenu.png
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/256x256/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/HPmenu.png
# Set up and install the desktop menue entry stuff using "Categories=System;Monitor;"
# and remove HP's hplip.desktop and hplip-systray.desktop files before because we use Source100:
# (additionally there is/was a typo in HP's install because of the trailing blank at 'applications ')
rm %{buildroot}%{_datadir}/applications/%{name}*.desktop
%suse_update_desktop_file -i %{name} Settings HardwareSettings Printing
%suse_update_desktop_file -i %{name} System HardwareSettings Printing
# Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop
# so that we can update its translations with translation-only packages.
%suse_update_desktop_file %{buildroot}/etc/xdg/autostart/hplip-systray.desktop
@ -447,6 +451,11 @@ sed -i -e '/^Exec=hp-systray$/s/hp-systray/hp-systray.wrapper/;' %{buildroot}/et
%fdupes -s %{buildroot}
%post
%if 0%{?suse_version} > 1130
%icon_theme_cache_post
%else
gtk-update-icon-cache %{_datadir}/icons/hicolor || true
%endif
/sbin/ldconfig
exit 0
@ -476,6 +485,11 @@ find /usr/share/hplip/ -name '*.py[co]' -delete
exit 0
%postun
%if 0%{?suse_version} > 1130
%icon_theme_cache_postun
%else
gtk-update-icon-cache %{_datadir}/icons/hicolor || true
%endif
/sbin/ldconfig
# If the package was removed (but not if it was updated)
# then remove the hpaio lines in /etc/sane.d/dll.conf.
@ -555,7 +569,7 @@ exit 0
/var/lib/hp/hplip.state
%doc %{_defaultdocdir}/%{name}/
%{_bindir}/hp-toolbox.wrapper
%{_datadir}/pixmaps/HPmenu.png
%{_datadir}/icons/hicolor/*/apps/HPmenu.png
%{_datadir}/applications/%{name}.desktop
%{_bindir}/hp-systray.wrapper
%{_datadir}/%{name}/