Accepting request 40280 from Printing

Copy from Printing/cups based on submit request 40280 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/40280
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=74
This commit is contained in:
OBS User autobuild 2010-05-25 08:36:50 +00:00 committed by Git OBS Bridge
commit 3362a554c3
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon May 10 20:12:43 UTC 2010 - guido+opensuse.org@berhoerster.name
- In cups.spec removed '-r' from the suse_update_desktop_file call
to not replace valid (and previously patched via
cups-1.3.9-desktop_file.patch) categories of the desktop file
so that it shows up in the right place (this is particularly
an issue with the LXDE/XFCE menu).
-------------------------------------------------------------------
Thu May 6 12:39:41 CEST 2010 - jsmeix@suse.de

View File

@ -30,7 +30,7 @@ License: GPLv2+ ; LGPLv2.1+
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.4.3
Release: 3
Release: 4
# Require the exact matching version-release of the cups-libs sub-package because
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
# because all CUPS software is built from the one same CUPS source tar ball
@ -305,7 +305,7 @@ do # Change default paper size from Letter to A4 if possible
done
# Add files for desktop menu:
rm -f $RPM_BUILD_ROOT/usr/share/applications/cups.desktop
%suse_update_desktop_file -i -r cups PrintingUtility 2>/dev/null
%suse_update_desktop_file -i cups PrintingUtility 2>/dev/null
mkdir $RPM_BUILD_ROOT/usr/share/pixmaps
install -m 644 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/cups.png $RPM_BUILD_ROOT/usr/share/pixmaps
rm -rf $RPM_BUILD_ROOT/usr/share/icons