From b71cad23e59e938b5d6e92d444d55f40070c00eb Mon Sep 17 00:00:00 2001
From: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Date: May 17 2019 18:43:31 +0000
Subject: Rename oc to hoc


---

diff --git a/neuron.spec b/neuron.spec
index 58d866a..bc8a777 100644
--- a/neuron.spec
+++ b/neuron.spec
@@ -31,7 +31,7 @@ Please install the %{name}-devel package to compile nmodl files and so on.
 
 Name:       neuron
 Version:    7.5
-Release:    5.20181214git%{shortcommit}%{?dist}
+Release:    6.20181214git%{shortcommit}%{?dist}
 Summary:    A flexible and powerful simulator of neurons and networks
 
 License:    GPLv3+
@@ -169,6 +169,11 @@ find . $RPM_BUILD_ROOT/%{_libdir}/ -name "*.o" -exec rm -f '{}' \;
 # Remove libtool archives
 find . $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la" -exec rm -f '{}' \;
 
+
+# Rename oc to hoc to prevent conflicts with origin-client binary oc
+# rhbz: 1696118
+mv $RPM_BUILD_ROOT/%{_bindir}/oc $RPM_BUILD_ROOT/%{_bindir}/hoc
+
 # Still needed on F28?
 %ldconfig_scriptlets
 
@@ -251,6 +256,10 @@ find . $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la" -exec rm -f '{}' \;
 %{_datadir}/%{tarname}/demo
 
 %changelog
+* Fri May 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 7.5-6.20181214git
+- Rename oc to hoc to prevent conflict with origin-client binary
+- rhbz 1696118
+
 * Sat Mar 02 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 7.5-5.20181214git5687519
 - Bump and rebuild