Merge pull request #1438 from degano/hector_sip_pyqt_ext_75X

Source hector, sip and pyqt from cms-externals.
cms-sw · Mar 11, 2015 · e56acb0 · e56acb0
2 parents c8fb568 + 033dc61
commit e56acb0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 166 deletions.
diff --git a/hector-1.3.4-fix-beam-dispersion-macro.patch b/hector-1.3.4-fix-beam-dispersion-macro.patch
diff --git a/hector-1.3.4-fix-narrowing-conversion.patch b/hector-1.3.4-fix-narrowing-conversion.patch
diff --git a/hector-1.3.4-macosx.patch b/hector-1.3.4-macosx.patch
diff --git a/hector.spec b/hector.spec
@@ -1,12 +1,9 @@
-### RPM external hector 1_3_4
-
-%define rname Hector
-%define realversion %(echo %v | cut -d- -f1 )
+### RPM external hector 1.3.4
+%define tag 365361cb7771593c2ff0ad91aa842858d44ded6d
+%define branch cms/v%{realversion}
+%define github_user cms-externals
+Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 Requires: root
-Source: http://cmsrep.cern.ch/cmssw/cms/SOURCES/slc5_amd64_gcc472/external/hector/1_3_4/Hector_1_3_4.tbz
-Patch0: hector-1.3.4-macosx
-Patch1: hector-1.3.4-fix-beam-dispersion-macro
-Patch2: hector-1.3.4-fix-narrowing-conversion
 
 %if "%{?cms_cxx:set}" != "set"
 %define cms_cxx g++
@@ -17,10 +14,8 @@ Patch2: hector-1.3.4-fix-narrowing-conversion
 %endif
 
 %prep
-%setup -q -n %{rname}_%{realversion}
-%patch0 -p2
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{n}-%{realversion}
+mkdir -p obj lib
 
 %build
 # On macosx strip -s means something different than on linux.

diff --git a/pyqt-fix-qt-conf-relocation-on-macosx.patch b/pyqt-fix-qt-conf-relocation-on-macosx.patch
diff --git a/pyqt-relocatable-build.patch b/pyqt-relocatable-build.patch
diff --git a/pyqt.spec b/pyqt.spec
@@ -1,22 +1,20 @@
 ### RPM external pyqt 4.8.1
 ## INITENV +PATH PYTHONPATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
-#Source: http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-%realversion.tar.gz
-Source: http://cmsrep.cern.ch/cmssw/pyqt-mirror/PyQt-x11-gpl-%realversion.tar.gz
-Patch0: pyqt-relocatable-build
-Patch1: pyqt-fix-qt-conf-relocation-on-macosx
+%define tag f909ea86706cd38b2d8b14d03205e896104b3c9b
+%define branch cms/v%{realversion}
+%define github_user cms-externals
+Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 Requires: python
 Requires: qt
 Requires: sip
 
 %prep
-%setup -n PyQt-x11-gpl-%realversion
+%setup -n %{n}-%{realversion}
 # pyqt builds and uses an helper program "qtdirs" to determine where qt is installed.
 # We had to patch its sources so that it reads the configuration file qt.conf
 # like other qt applications, so that we get the correctly relocated information.
 # Notice that in the build section we copy qt.conf from the QT installation to 
 # get the correct location.
-%patch0 -p1
-%patch1 -p0
 
 %build
 # See above for explanation.

diff --git a/sip-4.11.1-macosx.patch b/sip-4.11.1-macosx.patch
diff --git a/sip.spec b/sip.spec
@@ -1,12 +1,13 @@
 ### RPM external sip 4.11.2
 ## INITENV +PATH PYTHONPATH %i/lib/python$(echo $PYTHON_VERSION |cut -d. -f 1,2)/site-packages
-#Source: http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-%realversion.tar.gz
-Source: http://cmsrep.cern.ch/cmssw/pyqt-mirror/sip-%realversion.tar.gz
-Patch0: sip-4.11.1-macosx
+%define tag 51f6c53b52d0330ba46ecfd772a0a03db18ec75f
+%define branch cms/v%{realversion}
+%define github_user cms-externals
+Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 Requires: python
+
 %prep
-%setup -n sip-%realversion 
-%patch0 -p1
+%setup -n %{n}-%{realversion}
 
 %build
 python ./configure.py -v %i/share -b %i/bin -d %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages -e %i/include