get source from github (#372)

openhpc · Feb 23, 2017 · 743eb79 · 743eb79
1 parent dabcffc
commit 743eb79
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/components/provisioning/warewulf-cluster/SPECS/warewulf-cluster.spec b/components/provisioning/warewulf-cluster/SPECS/warewulf-cluster.spec
@@ -14,16 +14,16 @@
 %{!?PROJ_DELIM: %global PROJ_DELIM -ohpc}
 
 %define pname warewulf-cluster
+%define dname cluster
 
 Name:    %{pname}%{PROJ_DELIM}
 Summary: Tools used for clustering with Warewulf
-Version: 3.7
+Version: 3.7pre
 Release: %{_rel}
 License: US Dept. of Energy (BSD-like)
 Group:   %{PROJ_NAME}/provisioning
 URL:     http://warewulf.lbl.gov/
-#Source0: http://warewulf.lbl.gov/downloads/releases/warewulf-cluster/warewulf-cluster-%{version}.tar.gz
-Source0: http://build.openhpc.community/badge/warewulf-cluster-%{version}.tar.gz
+Source0: https://github.com/crbaird/warewulf3/archive/v3.7pre.tar.gz#/warewulf3-3.7pre.tar.gz
 Source1: OHPC_macros
 ExclusiveOS: linux
 Requires: warewulf-common%{PROJ_DELIM} warewulf-provision%{PROJ_DELIM} ntp
@@ -78,11 +78,12 @@ provisioned nodes.
 %endif
 
 %prep
-%setup -n %{pname}-%{version}
-
+%setup -n warewulf3-3.7pre
+cd %{dname}
 %patch1 -p1
 
 %build
+cd %{dname}
 ./autogen.sh
 %configure
 %{__make} %{?mflags}

diff --git a/components/provisioning/warewulf-common/SPECS/warewulf-common.spec b/components/provisioning/warewulf-common/SPECS/warewulf-common.spec
@@ -16,6 +16,7 @@
 %{!?PROJ_DELIM: %global PROJ_DELIM -ohpc}
 
 %define pname warewulf-common
+%define dname common
 
 Name:    %{pname}%{PROJ_DELIM}
 Summary: A suite of tools for clustering
@@ -24,8 +25,7 @@ Release: %{_rel}%{?dist}
 License: US Dept. of Energy (BSD-like)
 Group:   %{PROJ_NAME}/provisioning
 URL:     http://warewulf.lbl.gov/
-#Source0: http://warewulf.lbl.gov/downloads/releases/warewulf-common/warewulf-common-%{version}.tar.gz
-Source0: http://build.openhpc.community/badge/warewulf-common-%{version}.tar.gz
+Source0: https://github.com/crbaird/warewulf3/archive/v3.7pre.tar.gz#/warewulf3-3.7pre.tar.gz
 Source1: OHPC_macros
 ExclusiveOS: linux
 DocDir: %{OHPC_PUB}/doc/contrib
@@ -64,12 +64,14 @@ supporting libs.
 
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n warewulf3-3.7pre
+cd %{dname}
 %patch1 -p1
 %patch2 -p1
 
 
 %build
+cd %{dname}
 ./autogen.sh
 %configure --localstatedir=%{wwpkgdir}
 %{__make} %{?mflags}

diff --git a/components/provisioning/warewulf-ipmi/SPECS/warewulf-ipmi.spec b/components/provisioning/warewulf-ipmi/SPECS/warewulf-ipmi.spec
@@ -14,6 +14,7 @@
 %{!?PROJ_DELIM: %global PROJ_DELIM -ohpc}
 
 %define pname warewulf-ipmi
+%define dname ipmi
 %define debug_package %{nil}
 %define wwpkgdir /srv/warewulf
 
@@ -30,8 +31,7 @@ Release: %{_rel}%{?dist}
 License: US Dept. of Energy (BSD-like)
 Group: %{PROJ_NAME}/provisioning
 URL: http://warewulf.lbl.gov/
-#Source0: http://warewulf.lbl.gov/downloads/releases/warewulf-ipmi/warewulf-ipmi-%{version}.tar.gz
-Source0: http://build.openhpc.community/badge/warewulf-ipmi-%{version}.tar.gz
+Source0: https://github.com/crbaird/warewulf3/archive/v3.7pre.tar.gz#/warewulf3-3.7pre.tar.gz
 Source1: OHPC_macros
 Patch0: warewulf-ipmi-3.6-config_guess.patch
 ExclusiveOS: linux
@@ -51,12 +51,14 @@ adding IPMI functionality.
 
 
 %prep
-%setup -n %{pname}-%{version}
+%setup -n warewulf3-3.7pre
 %ifarch aarch64
+cd %{dname}
 %patch0 -p1
 %endif
 
 %build
+cd %{dname}
 ./autogen.sh
 %configure --localstatedir=%{wwpkgdir}
 %{__make} %{?mflags}

diff --git a/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec b/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec
@@ -17,6 +17,7 @@
 %define wwpkgdir /srv/warewulf
 
 %define pname warewulf-provision
+%define dname provision
 
 Name:    %{pname}%{PROJ_DELIM}
 Summary: Warewulf - Provisioning Module
@@ -25,8 +26,7 @@ Release: %{_rel}%{?dist}
 License: US Dept. of Energy (BSD-like)
 Group:   %{PROJ_NAME}/provisioning
 URL:     http://warewulf.lbl.gov/
-#Source0: http://warewulf.lbl.gov/downloads/releases/warewulf-provision/warewulf-provision-%{version}.tar.gz
-Source0: http://build.openhpc.community/badge/warewulf-provision-%{version}.tar.gz
+Source0: https://github.com/crbaird/warewulf3/archive/v3.7pre.tar.gz#/warewulf3-3.7pre.tar.gz
 Source1: OHPC_macros
 ExclusiveOS: linux
 Requires: warewulf-common%{PROJ_DELIM}
@@ -100,11 +100,13 @@ available the included GPL software.
 
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n warewulf3-3.7pre
+cd %{dname}
 %patch1 -p1
 %patch2 -p1
 
 %build
+cd %{dname}
 ./autogen.sh
 %configure --localstatedir=%{wwpkgdir}
 %{__make} %{?mflags}

diff --git a/components/provisioning/warewulf-vnfs/SPECS/warewulf-vnfs.spec b/components/provisioning/warewulf-vnfs/SPECS/warewulf-vnfs.spec
@@ -16,6 +16,7 @@
 %define debug_package %{nil}
 
 %define pname warewulf-vnfs
+%define dname vnfs
 
 Summary: Warewulf VNFS Module
 Name:    %{pname}%{PROJ_DELIM}
@@ -24,8 +25,7 @@ Release: %{_rel}%{?dist}
 License: US Dept. of Energy (BSD-like)
 Group:   %{PROJ_NAME}/provisioning
 URL:     http://warewulf.lbl.gov/
-#Source:  http://warewulf.lbl.gov/downloads/releases/warewulf-vnfs/warewulf-vnfs-%{version}.tar.gz
-Source:  http://build.openhpc.community/badge/warewulf-vnfs-%{version}.tar.gz
+Source0: https://github.com/crbaird/warewulf3/archive/v3.7pre.tar.gz#/warewulf3-3.7pre.tar.gz
 ExclusiveOS: linux
 Requires: warewulf-common%{PROJ_DELIM}
 Requires: pigz
@@ -53,15 +53,16 @@ Virtual Node FileSystem objects.
 
 
 %prep
-%setup -n %{pname}-%{version}
+%setup -n warewulf3-3.7pre
 
 # OpenHPC patches
-
+cd %{dname}
 %patch1 -p1
 %patch2 -p1
 
 
 %build
+cd %{dname}
 ./autogen.sh
 %configure
 %{__make} %{?mflags}