fixes in the specfile for f31 that has python3 as its unqualified python

[pcucontrol.git] / pcucontrol.spec

diff --git a/pcucontrol.spec b/pcucontrol.spec
index fefe860..d031973 100644 (file)
--- a/pcucontrol.spec
+++ b/pcucontrol.spec
@@ -1,9 +1,13 @@
 %define name pcucontrol
 %define version 1.0
-%define taglevel 11
+%define taglevel 14
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
+%global python_sitearch        %( python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
+
+# Turn off the brp-python-bytecompile automagic
+# this is required for fedora31 that has moved to python3 as a default
+%global _python_bytecompile_extra 0
 
 Name: %{name}
 Version: %{version}
@@ -20,7 +24,7 @@ URL: %{SCMURL}
 
 Requires: python
 Requires: OpenIPMI-tools
-Obsoletes: monitor-pcucontrol
+#Obsoletes: monitor-pcucontrol
 
 Summary: pcu controls for monitor and plcapi
 Group: Applications/System
@@ -33,13 +37,25 @@ supported models.
 %prep
 %setup -q
 
+#################### Important note
+# starting with fedora27, fedora comes with openssl-11.0g
+# and in this version 
+# X509_EXTENSION {aka struct X509_extension_st}
+# has become opaque
+# this is mentioned here
+# https://github.com/openssl/openssl/issues/2239
+# see https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes#Compatibility_Layer
+# 
+# so we turn off support for SSL starting with fedora27
+# this is in pcucontrol/models/intelamt/Makefile - see FCDISTRO
+
 %build
 # NOTE: the build uses g++ cmdamt/
 # NOTE: TMPDIR is needed here b/c the tmpfs of the build vserver is too small.
 cd pcucontrol/models/intelamt
 export TMPDIR=$PWD/tmp
 mkdir -p $TMPDIR
-make
+make FCDISTRO=%{fcdistro}
 cd ..
 
 %install
@@ -56,6 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 07 2019 Thierry <Parmentelat> - pcucontrol-1.0-14
+- for building on fedora27; had to drop support for openssl, see specfile for details
+
+* Mon Jun 25 2012 Stephen Soltesz <soltesz@cs.princeton.edu> - pcucontrol-1.0-13
+- remove many unnecessary debugging print statement.
+- move APC & DRAC to expect scripts.  Much greater control.
+
+* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - pcucontrol-1.0-12
+- Fixed DRAC regular expression for ssh, and added IP address for external
+- command.
+
 * Wed Jun 08 2011 s s <soltesz@cs.princeton.edu> - pcucontrol-1.0-11
 - Updated HPiLO, DRAC with expect scripts.
 - Updated other models to use subprocess module in favor of os.popen*