1
0
forked from cockpit/cockpit

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
This commit is contained in:
Klaus Kämpf 2015-02-07 17:48:34 +00:00 committed by Git OBS Bridge
parent c812719fc5
commit ee158b40d3
2 changed files with 18 additions and 12 deletions

View File

@ -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

View File

@ -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