provisioning/warewulf-common: bump to upstream v3.8.1
%{!?_rel:%{expand:%%global _rel 0.r%(test "1686" != "0000" && echo "1686" || svnversion | sed 's/[^0-9].*$//' | grep '^[0-9][0-9]*$' || git svn find-rev `git show -s --pretty=format:%h` || echo 0000)}}
-%define wwpkgdir /srv/
%include %{_sourcedir}/OHPC_macros
%define pname warewulf-common
%define dname common
-%define dev_branch_sha 166bcf8938e8e460fc200b0dfe4b61304c7d010a
+%define wwpkgdir /srv/
Name: %{pname}%{PROJ_DELIM}
Summary: A suite of tools for clustering
-Version: 3.8pre
+Version: 3.8.1
Release: %{_rel}%{?dist}
License: US Dept. of Energy (BSD-like)
Group: %{PROJ_NAME}/provisioning
URL: http://warewulf.lbl.gov/
-Source0: https://github.com/crbaird/warewulf3/archive/%{dev_branch_sha}.tar.gz#/warewulf3-%{version}.ohpc1.3.tar.gz
+Source0: https://github.com/warewulf/warewulf3/archive/3.8.1.tar.gz#/warewulf3-%{version}.tar.gz
Source1: OHPC_macros
ExclusiveOS: linux
BuildRequires: autoconf
@@ -37,14 +36,6 @@ Conflicts: warewulf <= 2.9
BuildArch: noarch
%endif
BuildRoot: %{?_tmppath}/%{pname}-%{version}-%{release}-root
-# 09/10/14 charles.r.baird@intel.com - patch to add SuSE as a system type
-Patch1: warewulf-common.system.patch
-# 04/01/16 karl.w.schulz@intel.com - patch to enable DB transaction handling from WW trunk
-Patch2: mysql.r1978.patch
-# 02/22/17 charles.r.baird@intel.com - alternate package names for SuSE
-Patch3 : warewulf-common.dbinit.patch
-Patch4 : warewulf-common.bin-file.patch
-Patch5 : warewulf-common.del_from_binstore.patch
%if 0%{?suse_version}
Requires: mysql perl-DBD-mysql
%else
@@ -69,13 +60,7 @@ supporting libs.
%prep
-%setup -q -n warewulf3-%{dev_branch_sha}
-cd %{dname}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p2
-%patch5 -p1
+%setup -q -n warewulf3-%{version}
%build
@@ -103,12 +88,16 @@ if [ $1 -eq 2 ] ; then
%{_bindir}/wwsh object canonicalize -t file >/dev/null 2>&1 || :
fi
+%if 0%{?suse_version}
+systemctl start mysql >/dev/null 2>&1 || :
+systemctl enable mysql >/dev/null 2>&1 || :
+%else
systemctl start mariadb >/dev/null 2>&1 || :
systemctl enable mariadb >/dev/null 2>&1 || :
+%endif
%clean
-rm -rf $RPM_BUILD_ROOT
%files
