From 1b0370180d627d4c63b51fac0f31073af9935e9d Mon Sep 17 00:00:00 2001
From: Gratien D'haese <gratien.dhaese@gmail.com>
Date: Thu, 21 Jun 2018 10:51:31 +0200
Subject: [PATCH] New release rear-2.4

---
 .gitignore |  2 +-
 rear.spec  | 55 ++++++------------------------------------------------
 sources    |  2 +-
 3 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index 700afcc..2dceb9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/rear-2.3.tar.gz
+/rear-2.4.tar.gz
diff --git a/rear.spec b/rear.spec
index 7b9893a..5d9bdcb 100644
--- a/rear.spec
+++ b/rear.spec
@@ -8,8 +8,8 @@
 
 Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool
 Name: rear
-Version: 2.3
-Release: 2%{?rpmrelease}%{?dist}
+Version: 2.4
+Release: 1%{?rpmrelease}%{?dist}
 License: GPLv3
 Group: Applications/File
 URL: http://relax-and-recover.org/
@@ -17,6 +17,7 @@ URL: http://relax-and-recover.org/
 # as GitHub stopped with download section we need to go back to Sourceforge for downloads
 Source: https://sourceforge.net/projects/rear/files/rear/%{version}/rear-%{version}.tar.gz
 
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # rear contains only bash scripts plus documentation so that on first glance it could be "BuildArch: noarch"
 # but actually it is not "noarch" because it only works on those architectures that are explicitly supported.
@@ -133,50 +134,6 @@ fi
 
 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
 
-### Add a specific os.conf so we do not depend on LSB dependencies
-%{?fedora:echo -e "OS_VENDOR=Fedora\nOS_VERSION=%{?fedora}" >etc/rear/os.conf}
-%{?mdkversion:echo -e "OS_VENDOR=Mandriva\nOS_VERSION=%{distro_rel}" >etc/rear/os.conf}
-%{?rhel:echo -e "OS_VENDOR=RedHatEnterpriseServer\nOS_VERSION=%{?rhel}" >etc/rear/os.conf}
-#%{?sles_version:echo -e "OS_VENDOR=SUSE_LINUX\nOS_VERSION=%{?sles_version}" >etc/rear/os.conf}
-#%{?suse_version:echo -e "OS_VENDOR=SUSE_LINUX\nOS_VERSION=%{?suse_version}" >etc/rear/os.conf}
-%if 0%{?suse_version} == 1110
-# SLE 11
-OS_VERSION="11"
-%endif
-%if 0%{?suse_version} == 1130
-# openSUSE 11.3
-OS_VERSION="11.3"
-%endif
-%if 0%{?suse_version} == 1140
-# openSUSE 11.4
-OS_VERSION="11.4"
-%endif
-%if 0%{?suse_version} == 1210
-# openSUSE 12.1
-OS_VERSION="12.1"
-%endif
-%if 0%{?suse_version} == 1220
-# openSUSE 12.2
-OS_VERSION="12.2"
-%endif
-%if 0%{?suse_version} == 1230
-# openSUSE 12.3
-OS_VERSION="12.3"
-%endif
-%if 0%{?suse_version} == 1310
-# openSUSE 13.1
-OS_VERSION="13.1"
-%endif
-%if 0%{?suse_version} == 1315
-# SLE 12
-OS_VERSION="12"
-%endif
-%if 0%{?suse_version} == 1320
-# openSUSE 13.2
-OS_VERSION="13.2"
-%endif
-%{?suse_version:echo -e "OS_VENDOR=SUSE_LINUX\nOS_VERSION=$OS_VERSION" >etc/rear/os.conf}
-
 %build
 
 %install
@@ -184,6 +141,9 @@ OS_VERSION="13.2"
 %{__make} install DESTDIR="%{buildroot}"
 %{__install} -Dp -m0644 rear.cron %{buildroot}%{_sysconfdir}/cron.d/rear
 
+%clean
+%{__rm} -rf %{buildroot}
+
 %files
 %defattr(-, root, root, 0755)
 %doc MAINTAINERS COPYING README.adoc doc/*.txt
@@ -196,9 +156,6 @@ OS_VERSION="13.2"
 %{_sbindir}/rear
 
 %changelog
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Thu Jul 30 2015 Johannes Meixner <jsmeix@suse.de>
 - For a changelog see the rear-release-notes.txt file.
 
diff --git a/sources b/sources
index 96001d9..1d9565f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rear-2.3.tar.gz) = 257ef1937b26201b20738a38ccd4752be9b2be368b6a4b6718bcc1130667a5c4338c7f21af2af19fe61614afbb5aea7fdc54e01d7a73f1804d418b72f3afa44e
+SHA512 (rear-2.4.tar.gz) = ce95b3ec61801926c7beaad99a0afb1029b8ec327cf73a467357791ed83f7e1e3588b76dd16a572c9293002b7bb95a0310ce2d2013bfcd6dd7f93846a58aaac9