diff --git a/rear.spec b/rear.spec index 6e0f7024e924f33bbae9d5fa7ca9a1e9d72d0fbc..0abe1f83df3296a138f40d90c187512a6c6d7b83 100644 --- a/rear.spec +++ b/rear.spec @@ -1,8 +1,9 @@ +%define anolis_release .0.1 Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool Name: rear Version: 2.4 -Release: 16%{?dist} +Release: 15%{anolis_release}%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -35,7 +36,6 @@ Patch33: rear-bz1930662.patch Patch35: rear-bz1983013.patch Patch38: rear-bz1983000.patch Patch39: rear-pr2675.patch -Patch42: rear-bz2061521.patch ExcludeArch: s390x ExcludeArch: s390 @@ -154,14 +154,12 @@ fi %patch35 -p1 %patch38 -p1 %patch39 -p1 -%patch42 -p1 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} -%{?rhel:echo -e "OS_VENDOR=RedHatEnterpriseServer\nOS_VERSION=%{?rhel}" >etc/rear/os.conf} - +%{?anolis:echo -e "OS_VENDOR=AnolisOS\nOS_VERSION=%{?anolis}" >etc/rear/os.conf} %build # asciidoc writes a timestamp to files it produces, based on the last # modified date of the source file, but is sensible to the timezone. @@ -189,8 +187,8 @@ TZ=UTC %{__make} -C doc %{_sbindir}/rear %changelog -* Tue Apr 26 2022 Pavel Cahyna - 2.4-16 -- Apply upstream PR2237 to include multipath disks in backup +* Fri May 20 2022 maqi - 2.4-15.0.1 +- Write os.conf for Anolis OS * Thu Dec 16 2021 Pavel Cahyna - 2.4-15 - Backport PR2608: