[condor] - turned off management, no support for qmf: -DWITH_MANAGEMENT:BOOL=FALSE - added patch Werror_repla

[Erik Erlandson]

commit 9e4da5a1d23867c56bfd6b6834946757c95d048e
Author: Erik Erlandson <eerlands at redhat.com>
Date:   Tue Feb 25 07:58:46 2014 -0700

    - turned off management, no support for qmf: -DWITH_MANAGEMENT:BOOL=FALSE
    - added patch Werror_replace.patch, to turn off the cmake regex-replace hack that removes "-Werror", as it breaks the new cflag "-Werror=format-security" passed in from build system
    - BuildRequires for python-devel and python-libs

 Werror_replace.patch |   13 +++++++++++++
 condor.spec          |   17 +++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/Werror_replace.patch b/Werror_replace.patch
new file mode 100644
index 0000000..73f7902
--- /dev/null
+++ b/Werror_replace.patch
@@ -0,0 +1,13 @@
+diff --git a/src/condor_contrib/CMakeLists.txt b/src/condor_contrib/CMakeLists.txt
+index 31aa3d6..dd67685 100644
+--- a/src/condor_contrib/CMakeLists.txt
++++ b/src/condor_contrib/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ 
+ if (WANT_CONTRIB)
+   dprint("building contrib modules")
+-  string(REGEX REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++  #string(REGEX REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+   #dprint( "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
+ 
+   if (HAVE_EXT_POSTGRESQL AND WANT_FULL_DEPLOYMENT)
diff --git a/condor.spec b/condor.spec
index 8bcec90..4bd3fd0 100644
--- a/condor.spec
+++ b/condor.spec
@@ -19,6 +19,9 @@ Source1:        %{name}-tmpfiles.conf
 Source2:        %{name}.service
 
 Patch1:         condor-gahp.patch
+# turn off the cmake regex-replace hack that removes "-Werror", as it 
+# breaks the new cflag "-Werror=format-security" passed in from build system:
+Patch2:         Werror_replace.patch
 
 #######################
 BuildRequires: cmake
@@ -77,6 +80,10 @@ BuildRequires: mongodb-devel
 #BuildRequires: log4cpp-devel
 #BuildRequires: gridsite-devel
 
+# we now need to request the python libs and includes explicitly:
+BuildRequires: python-devel
+BuildRequires: python-libs
+
 #######################
 # Installation requirements.
 Requires: mailx
@@ -282,6 +289,7 @@ exit 0
 %prep
 %setup -q -n %{newname}-%{commit}
 %patch1 -p1
+%patch2 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
 cp %{SOURCE2} %{name}.service
 
@@ -304,7 +312,7 @@ cp %{SOURCE2} %{name}.service
        -DWITH_POSTGRESQL:BOOL=FALSE \
        -DWANT_CONTRIB:BOOL=ON \
        -DWITH_PIGEON:BOOL=FALSE \
-       -DWITH_MANAGEMENT:BOOL=TRUE \
+       -DWITH_MANAGEMENT:BOOL=FALSE \
        -DWITH_PLUMAGE:BOOL=TRUE \
        -DWITH_AVIARY:BOOL=TRUE \
        -DWANT_FULL_DEPLOYMENT:BOOL=TRUE \
@@ -318,6 +326,7 @@ cp %{SOURCE2} %{name}.service
        -DWITH_PYTHON_BINDINGS:BOOL=TRUE \
        -DWITH_LIBCGROUP:BOOL=TRUE
 
+# smp is currently breaking the doc build in some obscure way
 #make %{?_smp_mflags}
 make
 
@@ -912,7 +921,7 @@ echo "*********** Verify NMI status is all GREEN ***********"
 /sbin/ldconfig
 
 %changelog
-* Fri Feb 21 2014 <eerlands at redhat.com> - 8.1.4-1.a1a7df5
+* Tue Feb 25 2014 <eerlands at redhat.com> - 8.1.4-1.a1a7df5
 - Update to latest source 8.1.4
 - Added new bosco man pages and quickstart
 - new man pages for condor_{drain, install, ping, rmdir, tail, who}
@@ -921,6 +930,10 @@ echo "*********** Verify NMI status is all GREEN ***********"
 - libpyclassad2.7_8_1_4.so
 - disabling new ganglia support for a rev or two
 - Overhaul and cleanup spec file
+- turned off management, no support for qmf: -DWITH_MANAGEMENT:BOOL=FALSE
+- added patch Werror_replace.patch, to turn off the cmake regex-replace hack that removes "-Werror", as it breaks the new cflag "-Werror=format-security" passed in from build system
+- BuildRequires for python-devel and python-libs
+- turned off SMP for make until doc build stops breaking with it
 - Archived legacy history
 
 * Sat Jun 22 2013 <tstclair at redhat.com> - 8.1.0-0.2