diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 514e18a..03a9cd2 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -19,10 +19,10 @@ License: GPLv3+ and MIT and BSD %global rolename0 kdump %global version0 1.0.0 -#%%global commit1 43eec5668425d295dce3801216c19b1916df1f9b -#%%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +%global commit1 611754bcc79783d026177c79a796c6d6343d1be5 +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global rolename1 postfix -%global version1 0.1 +#%%global version1 0.1 #%%global commit2 6dd057aa434a31cb6ee67d02967362f9131e0c50 #%%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) @@ -40,7 +40,7 @@ License: GPLv3+ and MIT and BSD #%%global version5 1.0.0 Source: https://github.com/linux-system-roles/%{rolename0}/archive/%{version0}.tar.gz#/%{rolename0}-%{version0}.tar.gz -Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{version1}.tar.gz#/%{rolename1}-%{version1}.tar.gz +Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{commit1}.tar.gz#/%{rolename1}-%{shortcommit1}.tar.gz Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{version2}.tar.gz#/%{rolename2}-%{version2}.tar.gz Source3: https://github.com/linux-system-roles/%{rolename3}/archive/%{version3}.tar.gz#/%{rolename3}-%{version3}.tar.gz Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{commit5}.tar.gz#/%{rolename5}-%{shortcommit5}.tar.gz @@ -62,8 +62,6 @@ Patch5: rhel-system-roles-%{rolename5}-prefix.diff # Not suitable for upstream, since the files need to be executable there Patch52: network-permissions.diff -Patch11: rhel-system-roles-postfix-pr5.diff - Url: https://github.com/linux-system-roles/ BuildArch: noarch @@ -84,11 +82,10 @@ of Red Hat Enterprise Linux. cd %{rolename0}-%{version0} #kdump patches here if necessary cd .. -cd %{rolename1}-%{version1} +cd %{rolename1}-%{commit1} %if "%{roleprefix}" != "linux-system-roles." %patch1 -p1 %endif -%patch11 -p1 cd .. cd %{rolename2}-%{version2} %if "%{roleprefix}" != "linux-system-roles." @@ -110,7 +107,7 @@ cd .. %build sh %{SOURCE8} \ %{rolename0}-%{version0}/README.md \ -%{rolename1}-%{version1}/README.md \ +%{rolename1}-%{commit1}/README.md \ %{rolename2}-%{version2}/README.md \ %{rolename3}-%{version3}/README.md \ %{rolename5}-%{commit5}/README.md @@ -119,7 +116,7 @@ sh %{SOURCE8} \ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles cp -pR %{rolename0}-%{version0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename0} -cp -pR %{rolename1}-%{version1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} +cp -pR %{rolename1}-%{commit1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} cp -pR %{rolename2}-%{version2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2} cp -pR %{rolename3}-%{version3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3} cp -pR %{rolename5}-%{commit5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5} @@ -234,6 +231,7 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples %changelog * Wed Oct 24 2018 Pavel Cahyna - 1.0-7 - Update to latest versions of selinux, kdump and timesync. +- Update to the latest revision of postfix, fixes README markup - Add Obsoletes for the -techpreview subpackage introduced mistakenly in 1.0-1 * Tue Oct 23 2018 Till Maas - 1.0-6