[openshift-origin-broker] Fixed 64 bit module problem, while keeping it a noarch (#858301)
tdawson
tdawson at fedoraproject.org
Wed Oct 3 13:41:32 UTC 2012
commit edd93bcec823fc55db4d7f57f1a509b73b8e1bf5
Author: Troy Dawson <tdawson at redhat.com>
Date: Wed Oct 3 08:40:48 2012 -0500
Fixed 64 bit module problem, while keeping it a noarch (#858301)
openshift-origin-broker.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index ace0aab..294ab76 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -10,7 +10,7 @@
Summary: OpenShift Origin broker components
Name: openshift-origin-broker
Version: 0.6.7
-Release: 11%{?dist}
+Release: 12%{?dist}
License: ASL 2.0
URL: http://openshift.redhat.com
Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
@@ -43,6 +43,8 @@ Requires: policycoreutils-python
Requires: systemd-units
%endif
+BuildArch: noarch
+
%description
This contains the broker 'controlling' components of OpenShift.
This includes the public APIs for the client tools.
@@ -86,7 +88,7 @@ mv %{buildroot}%{brokerdir}/init.d/stickshift-broker %{buildroot}%{_initddir}/%{
%endif
ln -s %{brokerdir}/public %{buildroot}%{htmldir}/broker
ln -s %{brokerdir}/public %{buildroot}%{brokerdir}/httpd/root/broker
-ln -sf %{_libdir}/httpd/modules %{buildroot}%{brokerdir}/httpd/modules
+ln -sf %{_sysconfdir}/httpd/modules %{buildroot}%{brokerdir}/httpd/modules
ln -sf /etc/httpd/conf/magic %{buildroot}%{brokerdir}/httpd/conf/magic
mv %{buildroot}%{brokerdir}/httpd/000000_stickshift_proxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
cp %{buildroot}%{brokerdir}/doc/selinux/stickshift-broker.te %{buildroot}/usr/share/selinux/packages/%{name}/
@@ -220,6 +222,9 @@ fi
%{_var}/log/stickshift
%changelog
+* Wed Oct 03 2012 Troy Dawson <tdawson at redhat.com> 0.6.7-12
+- Fixed 64 bit module problem, while keeping it a noarch (#858301)
+
* Mon Sep 24 2012 Troy Dawson <tdawson at redhat.com> 0.6.7-11
- Fixed 64 bit module problem, no longer a noarch (#858301)
- Added /var/log/stickshift (#858336)
More information about the scm-commits
mailing list