Accepting request 405989 from Printing

- Remove CUPS.desktop and pixmap
  * Obsoletes patch cups-1.3.9-desktop_file.patch

OBS-URL: https://build.opensuse.org/request/show/405989
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=135

cups-1.3.9-desktop_file.patch

@@ -1,14 +0,0 @@
-Index: desktop/cups.desktop.in
-===================================================================
---- desktop/cups.desktop.in.orig
-+++ desktop/cups.desktop.in
-@@ -1,6 +1,7 @@
- [Desktop Entry]
--Categories=System;Printing;HardwareSettings;X-Red-Hat-Base;
--Exec=@CUPS_HTMLVIEW@ http://localhost:631/
-+Categories=System;Printing;Settings;HardwareSettings;
-+Exec=desktop-launch http://localhost:631/
-+NotShowIn=GNOME;
- Icon=cups
- StartupNotify=false
- Terminal=false

cups.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 28 10:43:40 UTC 2016 - kamikazow@web.de
+
+- Remove CUPS.desktop and pixmap
+  * Obsoletes patch cups-1.3.9-desktop_file.patch
+
 -------------------------------------------------------------------
 Mon Feb 29 14:06:50 UTC 2016 - michael@stroeder.com
 

cups.spec

@@ -51,8 +51,6 @@ Patch100:       cups-pam.diff
 # Patch101 cups-2.0.3-additional_policies.patch adds the 'allowallforanybody' policy to cupsd.conf
 # see https://fate.novell.com/303515 and https://bugzilla.suse.com/show_bug.cgi?id=936309
 Patch101:       cups-2.0.3-additional_policies.patch
-# Patch102 cups-1.3.9-desktop_file.patch changes desktop/cups.desktop according to what SUSE needs:
-Patch102:       cups-1.3.9-desktop_file.patch
 # Patch103 cups-1.4-do_not_strip_recommended_from_PPDs.patch
 # reverts the change which was added by Michael Sweet in Jan 2007
 # which strips the word "recommended" from NickName in PPDs because
@@ -76,7 +74,6 @@ BuildRequires:  libtool
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(systemd)
@@ -260,8 +257,6 @@ browsing". This is now handled by cups-browsed service.
 # Patch101 cups-2.0.3-additional_policies.patch adds the 'allowallforanybody' policy to cupsd.conf
 # see https://fate.novell.com/303515 and https://bugzilla.suse.com/show_bug.cgi?id=936309
 %patch101
-# Patch102 cups-1.3.9-desktop_file.patch changes desktop/cups.desktop according to what SUSE needs:
-%patch102
 # Patch103 cups-1.4-do_not_strip_recommended_from_PPDs.patch
 # reverts the change which was added by Michael Sweet in Jan 2007
 # which strips the word "recommended" from NickName in PPDs because
@@ -381,11 +376,8 @@ install -m 644 %{SOURCE102} %{buildroot}%{_datadir}/cups/model/Postscript.ppd.gz
 install -m 644 %{SOURCE105} %{buildroot}%{_datadir}/cups/model/Postscript-level1.ppd.gz
 # Source106: Postscript-level2.ppd.gz
 install -m 644 %{SOURCE106} %{buildroot}%{_datadir}/cups/model/Postscript-level2.ppd.gz
-# Add files for desktop menu:
+# Rm files for desktop menu:
 rm -f %{buildroot}%{_datadir}/applications/cups.desktop
-%suse_update_desktop_file -i cups PrintingUtility 2>/dev/null
-mkdir %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/cups.png %{buildroot}%{_datadir}/pixmaps
 rm -rf %{buildroot}%{_datadir}/icons
 # Save /etc/cups/cupsd.conf and /etc/cups/cupsd.conf.default from becoming hardlinked
 # via the fdupes run below, see https://bugzilla.novell.com/show_bug.cgi?id=773971
@@ -490,7 +482,6 @@ exit 0
 # not build and install an executable when whatever condition
 # for configure's automated tests is not fulfilled in the build system.
 # See https://bugzilla.novell.com/show_bug.cgi?id=526847#c9
-%defattr(-,root,root)
 %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cups-files.conf
 %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cupsd.conf
 %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/snmp.conf
@@ -555,8 +546,6 @@ exit 0
 %{_libexecdir}/cups/notifier/mailto
 %{_libexecdir}/cups/notifier/rss
 %dir %attr(0775,root,ntadmin) %{_datadir}/cups/drivers
-%{_datadir}/applications/cups.desktop
-%{_datadir}/pixmaps/cups.png
 %doc %{_defaultdocdir}/cups
 %doc %{_mandir}/man1/cups.1.gz
 %doc %{_mandir}/man1/cupstestppd.1.gz