thepeg: build shared version of LesHouches; misc. cleanup

thepeg.spec

@@ -1,80 +1,63 @@
 ### RPM external thepeg 1.9.2
-## INITENV +PATH LD_LIBRARY_PATH %i/lib/ThePEG
-## INITENV +PATH DYLD_LIBRARY_PATH %i/lib/ThePEG
+## INITENV +PATH LD_LIBRARY_PATH %{i}/lib/ThePEG
+## INITENV +PATH DYLD_LIBRARY_PATH %{i}/lib/ThePEG
 
-%define thepegCommit 6c5b5a01430
+%define thepegCommit b03496397c12
 %define branch cms/v%realversion
 
 Source: git+https://github.com/cms-externals/thepeg.git?obj=%{branch}/%{thepegCommit}&export=thepeg-%{realversion}-%{thepegCommit}&module=thepeg-%realversion-%thepegCommit&output=/thepeg-%{realversion}-%{thepegCommit}.tgz
 Requires: lhapdf
 Requires: gsl
 Requires: hepmc
 Requires: zlib
+BuildRequires: autotools
 # FIXME: rivet?
 %define keep_archives true
-%if "%(case %cmsplatf in (osx*_*_gcc421) echo true ;; (*) echo false ;; esac)" == "true"
-Requires: gfortran-macosx
-%endif
 
 %if "%{?cms_cxx:set}" != "set"
 %define cms_cxx c++
 %endif
 
 %if "%{?cms_cxxflags:set}" != "set"
-%define cms_cxxflags -O2 -std=c++0x
+%define cms_cxxflags -O2 -std=c++11
 %endif
 
 %prep
 %setup -q -n thepeg-%{realversion}-%{thepegCommit}
 
-# Trick make not to re-run aclocal, autoconf, automake, autoscan, etc.
-find . -exec touch -m -t 201201010000 {} \;
+# Regenerate build scripts
+autoreconf -fiv
 
 %build
-# Build as static only on new architectures.
-case %cmsplatf in 
-  slc5*_*_gcc4[01234]*) 
-    CXX="`which %cms_cxx`"
-    CC="`which gcc`"    
-    PLATF_CONF_OPTS="--enable-shared --disable-static"
-    LIBGFORTRAN=`gfortran --print-file-name=libgfortran.so` 
-  ;;
-  *) perl -p -i -e 's|libLHAPDF[.]so|libLHAPDF.a|g' configure 
-    CXX="`which %cms_cxx` -fPIC"
-    CC="`which gcc` -fPIC"
-    PLATF_CONF_OPTS="--enable-shared --disable-static"
-    LIBGFORTRAN="`gfortran --print-file-name=libgfortran.so`"
-  ;;
-esac
-
-case %cmsplatf in
-  osx*) LIBGFORTRAN="`gfortran --print-file-name=libgfortran.a`" ;;
-esac
-
-case %cmsplatf in
-  osx*_*_gcc4[0-5]*) ;;
-  osx*_*_gcc*) LIBQUADMATH="-lquadmath" ;;
+CXX="$(which %{cms_cxx}) -fPIC"
+CC="$(which gcc) -fPIC"
+PLATF_CONF_OPTS="--enable-shared --disable-static"
+LIBGFORTRAN="$(gfortran --print-file-name=libgfortran.so)"
+
+case %{cmsplatf} in
+  osx*)
+    LIBGFORTRAN="$(gfortran --print-file-name=libgfortran.a)"
+    LIBQUADMATH="-lquadmath"
+    ;;
 esac
 
 ./configure $PLATF_CONF_OPTS \
             --disable-silent-rules \
             --with-LHAPDF=$LHAPDF_ROOT \
             --with-hepmc=$HEPMC_ROOT \
             --with-gsl=$GSL_ROOT --with-zlib=$ZLIB_ROOT \
-            --without-javagui --prefix=%i \
-            --disable-readline CXX="$CXX" CC="$CC" CXXFLAGS="%cms_cxxflags" \
+            --without-javagui --prefix=%{i} \
+            --disable-readline CXX="$CXX" CC="$CC" CXXFLAGS="%{cms_cxxflags}" \
             LIBS="$LIBGFORTRAN -lz $LIBQUADMATH"
-make
 
-%install
+make %{makeprocesses}
 
+%install
 make install
-cd %i/lib/ThePEG
-for item in LesHouches.so ; do
-  [ -e lib$item ] || ln -s $item lib$item
-done
-find %i/lib -name '*.la' -exec rm -f {} \;
+find %{i}/lib -name '*.la' -exec rm -f {} \;
 
 %post
 %{relocateConfig}lib/ThePEG/Makefile.common
-%{relocateConfig}lib/ThePEG/libtool
+%{relocateConfig}lib/ThePEG/Makefile
+%{relocateConfig}lib/ThePEG/ThePEGDefaults.rpo
+%{relocateConfig}lib/ThePEG/ThePEGDefaults-1.9.2.rpo