ralph pushed to fedmsg (epel7). "Adjust ownership of fedmsg.d/ files."

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 23 15:40:33 UTC 2015


>From 4f61d24d3ea3cc452188b70f64c876a8937c431a Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Thu, 23 Apr 2015 11:32:33 -0400
Subject: Adjust ownership of fedmsg.d/ files.


diff --git a/fedmsg.spec b/fedmsg.spec
index 6d47cfb..0e37e7f 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -253,10 +253,19 @@ fi
 %{python_sitelib}/%{modname}-%{version}-py%{pyver}.egg-info/
 
 %dir %{_sysconfdir}/fedmsg.d/
+
+# Own these only on rhel6 due to some byte-compiling I can't seem to control
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%config(noreplace) %{_sysconfdir}/fedmsg.d/base.py*
+%config(noreplace) %{_sysconfdir}/fedmsg.d/endpoints.py*
+%config(noreplace) %{_sysconfdir}/fedmsg.d/logging.py*
+%config(noreplace) %{_sysconfdir}/fedmsg.d/ssl.py*
+%else
 %config(noreplace) %{_sysconfdir}/fedmsg.d/base.py
 %config(noreplace) %{_sysconfdir}/fedmsg.d/endpoints.py
 %config(noreplace) %{_sysconfdir}/fedmsg.d/logging.py
 %config(noreplace) %{_sysconfdir}/fedmsg.d/ssl.py
+%endif
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{modname}
 
@@ -280,35 +289,39 @@ fi
 %{_bindir}/fedmsg-relay
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-relay
+%config(noreplace) %{_sysconfdir}/fedmsg.d/relay.py*
 %else
 %{_unitdir}/fedmsg-relay.service
+%config(noreplace) %{_sysconfdir}/fedmsg.d/relay.py
 %endif
 
-%config(noreplace) %{_sysconfdir}/fedmsg.d/relay.py
 
 %files irc
 %{_bindir}/fedmsg-irc
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-irc
+%config(noreplace) %{_sysconfdir}/fedmsg.d/ircbot.py*
 %else
 %{_unitdir}/fedmsg-irc.service
+%config(noreplace) %{_sysconfdir}/fedmsg.d/ircbot.py
 %endif
 
-%config(noreplace) %{_sysconfdir}/fedmsg.d/ircbot.py
 
 %files gateway
 %{_bindir}/fedmsg-gateway
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-gateway
+%config(noreplace) %{_sysconfdir}/fedmsg.d/gateway.py*
 %else
 %{_unitdir}/fedmsg-gateway.service
-%endif
 %config(noreplace) %{_sysconfdir}/fedmsg.d/gateway.py
+%endif
 
 %changelog
 * Thu Apr 23 2015 Ralph Bean <rbean at redhat.com> - 0.13.1-1
 - new version
 - add dep on python-six
+- adjust ownership of fedmsg.d/ files.
 
 * Wed Apr 15 2015 Ralph Bean <rbean at redhat.com> - 0.13.0-1
 - new version
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/fedmsg.git/commit/?h=epel7&id=4f61d24d3ea3cc452188b70f64c876a8937c431a


More information about the scm-commits mailing list