diff --git a/.gitignore b/.gitignore index cee6a94..e8ec29a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /cockpit-0.69.tar.bz2 /cockpit-0.70.tar.bz2 /cockpit-0.71.tar.bz2 +/cockpit-0.73.tar.bz2 diff --git a/cockpit.spec b/cockpit.spec index 74e2420..2d89ca3 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,11 +1,15 @@ +%define tag 0.73 +%define rel 1 # Globals that might be defined elsewhere # * gitcommit xxxx # * selinux 1 +# * tag 0.71 %define branding auto +%define rel 1 %if %{defined gitcommit} -%define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC' +%define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC -g' %define branding default %endif @@ -31,14 +35,17 @@ %if 0%{?fedora} > 0 && 0%{?fedora} >= 22 %define libssh_version 0.7.1 %endif +%if 0%{?rhel} +%define libssh_version 0.7.1 +%endif Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else -Version: 0.71 +Version: %{tag} %endif -Release: 1%{?dist} +Release: %{rel}%{?dist} Summary: A user interface for Linux servers License: LGPLv2+ @@ -255,9 +262,16 @@ rm -rf %{buildroot}/usr/src/debug cat subscriptions.list docker.list >> shell.list %endif +# Only strip out debug info in non wip builds +%if %{defined gitcommit} +%define find_debug_info %{nil} +%else +%define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" +%endif + # Redefine how debug info is built to slip in our extra debug files %define __debug_install_post \ - %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" \ + %{find_debug_info} \ cat debug.list >> %{_builddir}/%{?buildsubdir}/debugfiles.list \ %{nil} @@ -272,10 +286,12 @@ cat subscriptions.list docker.list >> shell.list %files bridge %doc %{_mandir}/man1/cockpit-bridge.1.gz +%doc %{_mandir}/man8/pam_ssh_add.8.gz %{_bindir}/cockpit-bridge %attr(4755, -, -) %{_libexecdir}/cockpit-polkit %{_libexecdir}/cockpit-wrapper %{_libdir}/security/pam_reauthorize.so +%{_libdir}/security/pam_ssh_add.so %{_datadir}/dbus-1/services/com.redhat.Cockpit.service %files doc @@ -439,6 +455,13 @@ fi %endif %changelog +* Wed Aug 26 2015 Stef Walter - 0.73-1 +- * Kubernetes UI can connect to non-local API server +- * Automate Web Service container build on Docker Hub +- * Add validation options to TLS client connections +- * PAM pam_ssh_add.so module for loading SSH keys based on login password +- * Build, testing and other fixes + * Mon Aug 17 2015 Peter - 0.71-1 - Update to 0.71 release. diff --git a/sources b/sources index e3eca55..1fc5bcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b99aa828513fd0ec0fcfff4e9d9304e1 cockpit-0.71.tar.bz2 +e252e5815c7ba431da5c70e42d76d6b3 cockpit-0.73.tar.bz2