Merge remote-tracking branch 'qubesos/pr/53'

* qubesos/pr/53:
  Handle fallthrough with attribute(noreturn) for consistancy and compatiblity with older GCC
  Add CENTOS/RHEL support (drop fedora-release dependancy as template builder will install it anyway and here it only make harder to support non-fedora builds)

qubes-rpc/gui-fatal.h

@@ -1,3 +1,3 @@
-void gui_fatal(const char *fmt, ...);
+void gui_fatal(const char *fmt, ...) __attribute__((noreturn));
 void gui_nonfatal(const char *fmt, ...);
-void qfile_gui_fatal(const char *fmt, va_list args);
+void qfile_gui_fatal(const char *fmt, va_list args) __attribute__((noreturn));

rpm_spec/core-agent.spec

@@ -112,7 +112,6 @@ Group:		Qubes
 Vendor:		Invisible Things Lab
 License:	GPL
 URL:		http://www.qubes-os.org
-Requires:   fedora-release
 %if %{fedora} < 22
 Requires:   yum-plugin-post-transaction-actions
 %endif
@@ -145,6 +144,9 @@ Requires:   python3-dnf-plugins-qubes-hooks
 %else
 Requires:   python2-dnf-plugins-qubes-hooks
 %endif
+%if 0%{?rhel} >= 7
+Requires:   python34-dnf-plugins-qubes-hooks
+%endif
 Obsoletes:  qubes-core-vm-kernel-placeholder <= 1.0
 Obsoletes:  qubes-upgrade-vm < 3.2
 Provides:   qubes-core-vm = %{version}-%{release}
@@ -171,8 +173,9 @@ DNF plugin for Qubes specific post-installation actions:
  * notify dom0 that updates were installed
  * refresh applications shortcut list
 
+%if 0%{fedora} >= 23
 %package -n python3-dnf-plugins-qubes-hooks
-Summary:	DNF plugin for Qubes specific post-installation actions
+Summary:        DNF plugin for Qubes specific post-installation actions
 BuildRequires: python3-devel
 %{?python_provide:%python_provide python3-dnf-plugins-qubes-hooks}
 
@@ -180,6 +183,19 @@ BuildRequires: python3-devel
 DNF plugin for Qubes specific post-installation actions:
  * notify dom0 that updates were installed
  * refresh applications shortcut list
+%endif
+
+%if 0%{?rhel} >= 7
+%package -n python34-dnf-plugins-qubes-hooks
+Summary:        DNF plugin for Qubes specific post-installation actions
+BuildRequires: python34-devel
+%{?python_provide:%python_provide python34-dnf-plugins-qubes-hooks}
+
+%description -n python34-dnf-plugins-qubes-hooks
+DNF plugin for Qubes specific post-installation actions:
+ * notify dom0 that updates were installed
+ * refresh applications shortcut list
+%endif
 
 %package qrexec
 Summary:    Qubes qrexec agent
@@ -619,8 +635,15 @@ rm -f %{name}-%{version}
 %files -n python2-dnf-plugins-qubes-hooks
 %{python2_sitelib}/dnf-plugins/*
 
+%if 0%{fedora} >= 23
 %files -n python3-dnf-plugins-qubes-hooks
 %{python3_sitelib}/dnf-plugins/*
+%endif
+
+%if 0%{?rhel} >= 7
+%files -n python34-dnf-plugins-qubes-hooks
+%{python3_sitelib}/dnf-plugins/*
+%endif
 
 %files qrexec
 %config(noreplace) /etc/pam.d/qrexec