From ee158b40d3f17178f67fa66d7b69790ed94f331d8e7c272e12419cf27e886d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Sat, 7 Feb 2015 17:48:34 +0000
Subject: [PATCH] drop add-genericname.patch, %suse_setup_desktop_file sets the
 GenericName

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=9
---
 add-genericname.patch |  8 --------
 cockpit.spec          | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 add-genericname.patch

diff --git a/add-genericname.patch b/add-genericname.patch
deleted file mode 100644
index a5c4795..0000000
--- a/add-genericname.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.38/src/ws/cockpit.desktop.in ./src/ws/cockpit.desktop.in
---- ../orig-cockpit-0.38/src/ws/cockpit.desktop.in	2015-01-09 13:41:41.000000000 +0100
-+++ ./src/ws/cockpit.desktop.in	2015-02-07 15:29:04.307418107 +0100
-@@ -7,3 +7,4 @@
- Type=Application
- Categories=GNOME;GTK;System;Profiling;
- _Keywords=Remote;Administration;
-+GenericName=Cockpit server manager
diff --git a/cockpit.spec b/cockpit.spec
index 6e0be00..54d22b7 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -36,8 +36,7 @@ Source0:        cockpit-%{version}.tar.gz
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.bz2
 %endif
 %if 0%{?suse_version}
-Patch1:         add-genericname.patch
-Patch2:         fix-docker-path.patch
+Patch:          fix-docker-path.patch
 Source1:        cockpit-suse.pam
 %else
 Source1:        cockpit-fedora.pam
@@ -172,8 +171,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
 	sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in
 %endif
 %if 0%{?suse_version}
-%patch1 -p1
-%patch2 -p1
+%patch -p1
 %endif
 
 %build
@@ -217,7 +215,9 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html
 %endif
 
 %files
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %{_docdir}/%{name}/AUTHORS
 %{_docdir}/%{name}/COPYING
 %{_docdir}/%{name}/README.md
@@ -229,7 +229,9 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html
 %{_datadir}/pixmaps
 
 %files bridge
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %doc %{_mandir}/man1/cockpit-bridge.1.gz
 %{_bindir}/cockpit-bridge
 %attr(4755, -, -) %{_libexecdir}/cockpit-polkit
@@ -239,20 +241,26 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html
 %{_libdir}/security/pam_reauthorize.so
 
 %files daemon
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %doc %{_mandir}/man8/cockpitd.8.gz
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
 %{_libexecdir}/cockpitd
 
 %files doc
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %exclude %{_docdir}/%{name}/AUTHORS
 %exclude %{_docdir}/%{name}/COPYING
 %exclude %{_docdir}/%{name}/README.md
 %{_docdir}/%{name}
 
 %files shell
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %{_datadir}/%{name}/base
 %{_datadir}/%{name}/shell
 %{_datadir}/%{name}/playground
@@ -265,7 +273,9 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html
 %endif
 
 %files ws
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %doc %{_mandir}/man5/cockpit.conf.5.gz
 %doc %{_mandir}/man8/cockpit-ws.8.gz
 %config(noreplace) %{_sysconfdir}/%{name}
@@ -328,7 +338,9 @@ The Cockpit components for interacting with Docker and user interface.
 This package is not yet complete.
 
 %files docker
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %{_datadir}/%{name}/docker
 
 %endif
@@ -344,7 +356,9 @@ This package contains programs and other files for testing Cockpit, and
 pulls in some necessary packages via dependencies.
 
 %files test-assets
+%if 0%{?suse_version}
 %defattr(-,root,root)
+%endif
 %{_datadir}/cockpit-test-assets
 %{_datadir}/polkit-1/rules.d
 /usr/lib/systemd/system/cockpit-testing.service