diff --git a/.gitignore b/.gitignore index 09ae449..1948548 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/kdump-1.0.0-rc.1.tar.gz -SOURCES/network-d866422.tar.gz +SOURCES/kdump-4b40b01.tar.gz +SOURCES/network-64b2d76.tar.gz SOURCES/postfix-0.1.tar.gz -SOURCES/selinux-6dd057a.tar.gz -SOURCES/timesync-1.0.0-rc.1.tar.gz +SOURCES/selinux-1.0.0.tar.gz +SOURCES/timesync-1.0.0.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 9c5a7c4..9f67635 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,5 +1,5 @@ -50f9e33a7ea64bd6251a3f091227c55d232a4a08 SOURCES/kdump-1.0.0-rc.1.tar.gz -546b39827090e971dac449a12d3af52f6d1e7ab2 SOURCES/network-d866422.tar.gz +0d49f208eb69b9266de9bd4505cfe5858af0f54a SOURCES/kdump-4b40b01.tar.gz +7199b5d21ccced62f4cc754f536bedcf68b3ad86 SOURCES/network-64b2d76.tar.gz 66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz -4dcff70976d75c732a2ebca786090ba59f41cb95 SOURCES/selinux-6dd057a.tar.gz -997b129eae558e84507ca01e4557d527ca43e9b2 SOURCES/timesync-1.0.0-rc.1.tar.gz +ad58a43c113551559d1a5bab9f9c6c99f923f7c3 SOURCES/selinux-1.0.0.tar.gz +7e6559e43aa58796a67b6341abe484e3cbc3db27 SOURCES/timesync-1.0.0.tar.gz diff --git a/SOURCES/rhel-system-roles-network-prefix.diff b/SOURCES/rhel-system-roles-network-prefix.diff index 3065f21..d60a8ea 100644 --- a/SOURCES/rhel-system-roles-network-prefix.diff +++ b/SOURCES/rhel-system-roles-network-prefix.diff @@ -29,30 +29,27 @@ index 0ba168a..e4c4a54 100644 - - linux-system-roles.network + - rhel-system-roles.network diff --git a/examples/eth-with-vlan.yml b/examples/eth-with-vlan.yml -index 63c7432..1c8ee60 100644 ---- a/examples/eth-with-vlan.yml -+++ b/examples/eth-with-vlan.yml -@@ -25,4 +25,4 @@ +--- a/examples/eth-with-vlan.yml 2018-08-21 20:47:38.000000000 +0200 ++++ b/examples/eth-with-vlan.yml 2018-11-06 22:29:14.591770335 +0100 +@@ -26,4 +26,4 @@ - "192.0.2.{{ network_iphost }}/24" roles: - - linux-system-roles.network + - rhel-system-roles.network diff --git a/examples/infiniband.yml b/examples/infiniband.yml -index e7197fe..b8710d4 100644 ---- a/examples/infiniband.yml -+++ b/examples/infiniband.yml -@@ -22,4 +22,4 @@ +--- a/examples/infiniband.yml 2018-08-21 20:47:38.000000000 +0200 ++++ b/examples/infiniband.yml 2018-11-06 22:29:14.591770335 +0100 +@@ -23,4 +23,4 @@ - 198.51.100.133/30 roles: - - linux-system-roles.network + - rhel-system-roles.network diff --git a/examples/macvlan.yml b/examples/macvlan.yml -index 0e6ba1b..14f5dd8 100644 --- a/examples/macvlan.yml +++ b/examples/macvlan.yml -@@ -24,4 +24,4 @@ +@@ -26,4 +26,4 @@ - 192.168.1.1/24 roles: diff --git a/SOURCES/rhel-system-roles-postfix-pr5.diff b/SOURCES/rhel-system-roles-postfix-pr5.diff new file mode 100644 index 0000000..4da6f48 --- /dev/null +++ b/SOURCES/rhel-system-roles-postfix-pr5.diff @@ -0,0 +1,40 @@ +diff --git a/README.md b/README.md +index 5950215..df64284 100644 +--- a/README.md ++++ b/README.md +@@ -17,7 +17,7 @@ Example Playbook + + Install and enable postfix. Configure "relay_domains=$mydestination" and + +-``` ++```yaml + --- + - hosts: all + vars: +@@ -31,7 +31,7 @@ Install and enable postfix. Configure "relay_domains=$mydestination" and + Install and enable postfix. Do not run 'postfix check' before restarting + postfix: + +-``` ++```yaml + --- + - hosts: all + vars: +@@ -43,7 +43,7 @@ postfix: + Install and enable postfix. Do single backup of main.cf (older backup will be + rewritten) and configure "relay_host=example.com": + +-``` ++```yaml + --- + - hosts: all + vars: +@@ -58,7 +58,7 @@ Install and enable postfix. Do timestamped backup of main.cf and + configure "relay_host=example.com" (if postfix_backup_multiple is + set to true postfix_backup is ignored): + +-``` ++```yaml + --- + - hosts: all + vars: diff --git a/SOURCES/rhel-system-roles-timesync-prefix.diff b/SOURCES/rhel-system-roles-timesync-prefix.diff index 02f9bb0..e985a80 100644 --- a/SOURCES/rhel-system-roles-timesync-prefix.diff +++ b/SOURCES/rhel-system-roles-timesync-prefix.diff @@ -1,8 +1,7 @@ -diff --git a/README.md b/README.md -index 122b725..3866c2e 100644 ---- a/README.md -+++ b/README.md -@@ -70,7 +70,7 @@ Install and configure ntp to synchronize the system clock with three NTP servers +diff -up timesync-1.0.0/README.md.orig timesync-1.0.0/README.md +--- timesync-1.0.0/README.md.orig 2018-08-21 11:46:41.000000000 +0200 ++++ timesync-1.0.0/README.md 2018-11-06 22:29:14.586770442 +0100 +@@ -81,7 +81,7 @@ Install and configure ntp to synchronize - hostname: baz.example.com iburst: yes roles: @@ -11,7 +10,7 @@ index 122b725..3866c2e 100644 ``` Install and configure linuxptp to synchronize the system clock with a -@@ -83,7 +83,7 @@ grandmaster in PTP domain number 0, which is accessible on interface eth0: +@@ -94,7 +94,7 @@ grandmaster in PTP domain number 0, whic - number: 0 interfaces: [ eth0 ] roles: @@ -20,7 +19,7 @@ index 122b725..3866c2e 100644 ``` Install and configure chrony and linuxptp to synchronize the system clock with -@@ -110,5 +110,5 @@ synchronization: +@@ -121,5 +121,5 @@ synchronization: transport: UDPv4 delay: 0.000010 roles: diff --git a/SOURCES/timesync-playbook.yml b/SOURCES/timesync-playbook.yml index 1b1b081..782ea91 100644 --- a/SOURCES/timesync-playbook.yml +++ b/SOURCES/timesync-playbook.yml @@ -1,7 +1,7 @@ --- - hosts: targets vars: - ntp_servers: + timesync_ntp_servers: - hostname: 0.rhel.pool.ntp.org iburst: yes - hostname: 1.rhel.pool.ntp.org @@ -11,4 +11,4 @@ - hostname: 3.rhel.pool.ntp.org iburst: yes roles: - - linux-system-roles.timesync + - rhel-system-roles.timesync diff --git a/SOURCES/timesync-pool-playbook.yml b/SOURCES/timesync-pool-playbook.yml index f186a53..ed07d4b 100644 --- a/SOURCES/timesync-pool-playbook.yml +++ b/SOURCES/timesync-pool-playbook.yml @@ -1,9 +1,9 @@ --- - hosts: targets vars: - ntp_servers: + timesync_ntp_servers: - hostname: 2.rhel.pool.ntp.org pool: yes iburst: yes roles: - - linux-system-roles.timesync + - rhel-system-roles.timesync diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index e3f9dcd..10ac280 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -1,91 +1,113 @@ +%if 0%{?rhel} Name: rhel-system-roles +%else +Name: linux-system-roles +%endif Summary: Set of interfaces for unified system management Version: 1.0 -Release: 2%{?dist} +Release: 5%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD -%global rolecompatprefix rhel-system-roles. -%global roleprefix linux-system-roles. - -%global commit0 fe8bb81966b60fa8979f3816a12b0c7120d71140 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%if 0%{?rhel} +%global rolealtprefix linux-system-roles. +%endif +%global roleprefix %{name}. + +# For each role, call either defcommit() or deftag(). The other macros +# (%%id and %%shortid) can be then used in the same way in both cases. +# This way the rest of the spec file des not need to know whether we are +# dealing with a tag or a commit. +%define defcommit() %{expand:%%global id%{1} %{2} +%%global shortid%{1} %%(c=%%{id%{1}}; echo ${c:0:7}) +} + +%define deftag() %{expand:%%global id%{1} %{2} +%%global shortid%{1} %{2} +} + +%defcommit 0 4b40b01079e82b1c5f948ae87d81a135069747cc %global rolename0 kdump -%global version0 1.0.0-rc.1 +#%%deftag 0 1.0.0 -%global commit1 43eec5668425d295dce3801216c19b1916df1f9b -%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +#%%defcommit 1 43eec5668425d295dce3801216c19b1916df1f9b %global rolename1 postfix -%global version1 0.1 +%deftag 1 0.1 -%global commit2 6dd057aa434a31cb6ee67d02967362f9131e0c50 -%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) +#%%defcommit 2 6dd057aa434a31cb6ee67d02967362f9131e0c50 %global rolename2 selinux -#%%global version2 0.1 +%deftag 2 1.0.0 -%global commit3 33a1a8c349de10d6281ed83d4c791e9177d7a141 -%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) +#%%defcommit 3 33a1a8c349de10d6281ed83d4c791e9177d7a141 %global rolename3 timesync -%global version3 1.0.0-rc.1 +%deftag 3 1.0.0 -%global commit5 d866422d9d73ed823632a3c56ee8575cd56cad5b -%global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) +%defcommit 5 64b2d76de74df2d480394d02aae204beda4d9257 %global rolename5 network -#%%global version5 0.4 - +#%%deftag 5 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 -Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{commit2}.tar.gz#/%{rolename2}-%{shortcommit2}.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 +Source: https://github.com/linux-system-roles/%{rolename0}/archive/%{id0}.tar.gz#/%{rolename0}-%{shortid0}.tar.gz +Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{id1}.tar.gz#/%{rolename1}-%{shortid1}.tar.gz +Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{id2}.tar.gz#/%{rolename2}-%{shortid2}.tar.gz +Source3: https://github.com/linux-system-roles/%{rolename3}/archive/%{id3}.tar.gz#/%{rolename3}-%{shortid3}.tar.gz +Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{id5}.tar.gz#/%{rolename5}-%{shortid5}.tar.gz Source6: timesync-playbook.yml Source7: timesync-pool-playbook.yml +%if "%{roleprefix}" != "linux-system-roles." Patch1: rhel-system-roles-%{rolename1}-prefix.diff Patch2: rhel-system-roles-%{rolename2}-prefix.diff Patch3: rhel-system-roles-%{rolename3}-prefix.diff Patch5: rhel-system-roles-%{rolename5}-prefix.diff +%endif + +Patch11: rhel-system-roles-postfix-pr5.diff Url: https://github.com/linux-system-roles/ BuildArch: noarch +Obsoletes: rhel-system-roles-techpreview < 1.0-3 + +# We need to put %%description within the if block to avoid empty +# lines showing up. +%if 0%{?rhel} %description Collection of Ansible roles and modules that provide a stable and consistent configuration interface for managing multiple versions of Red Hat Enterprise Linux. - -%package techpreview -Summary: Set of interfaces for unified system management (tech preview) -# to be updated when roles move to/from the main package to this one -Conflicts: rhel-system-roles < 1.0-1 - -%description techpreview -Collection of Ansible roles and modules that provide a consistent -configuration interface for managing multiple versions of Red Hat -Enterprise Linux. - -The roles in this subpackage are available as Technology Preview -and their backward compatibility is not guaranteed. - +%else +%description +Collection of Ansible roles and modules that provide a stable and +consistent configuration interface for managing multiple versions +of Fedora, Red Hat Enterprise Linux & CentOS. +%endif %prep %setup -qc -a1 -a2 -a3 -a5 -cd %{rolename0}-%{version0} +cd %{rolename0}-%{id0} #kdump patches here if necessary cd .. -cd %{rolename1}-%{version1} +cd %{rolename1}-%{id1} +%if "%{roleprefix}" != "linux-system-roles." %patch1 -p1 +%endif +%patch11 -p1 cd .. -cd %{rolename2}-%{commit2} +cd %{rolename2}-%{id2} +%if "%{roleprefix}" != "linux-system-roles." %patch2 -p1 +%endif cd .. -cd %{rolename3}-%{version3} +cd %{rolename3}-%{id3} +%if "%{roleprefix}" != "linux-system-roles." %patch3 -p1 +%endif cd .. -cd %{rolename5}-%{commit5} +cd %{rolename5}-%{id5} +%if "%{roleprefix}" != "linux-system-roles." %patch5 -p1 +%endif cd .. %build @@ -93,17 +115,19 @@ cd .. %install mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles -cp -pR %{rolename0}-%{version0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename0} -cp -pR %{rolename1}-%{version1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename1} -cp -pR %{rolename2}-%{commit2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename2} -cp -pR %{rolename3}-%{version3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename3} -cp -pR %{rolename5}-%{commit5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename5} +cp -pR %{rolename0}-%{id0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename0} +cp -pR %{rolename1}-%{id1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} +cp -pR %{rolename2}-%{id2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2} +cp -pR %{rolename3}-%{id3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3} +cp -pR %{rolename5}-%{id5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5} -ln -s %{rolecompatprefix}%{rolename0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename0} -ln -s %{rolecompatprefix}%{rolename1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} -ln -s %{rolecompatprefix}%{rolename2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2} -ln -s %{rolecompatprefix}%{rolename3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3} -ln -s %{rolecompatprefix}%{rolename5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5} +%if 0%{?rolealtprefix:1} +ln -s %{roleprefix}%{rolename0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename0} +ln -s %{roleprefix}%{rolename1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename1} +ln -s %{roleprefix}%{rolename2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename2} +ln -s %{roleprefix}%{rolename3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename3} +ln -s %{roleprefix}%{rolename5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename5} +%endif mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/kdump mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/postfix @@ -113,102 +137,107 @@ install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-times install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-timesync-pool-playbook.yml mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/network -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}kdump/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}kdump/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/kdump -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}postfix/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}postfix/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}postfix/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}postfix/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/postfix -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/selinux -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/selinux-playbook.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/selinux-playbook.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/selinux/example-selinux-playbook.yml -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}timesync/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}timesync/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/timesync -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/LICENSE \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/LICENSE \ $RPM_BUILD_ROOT%{_pkgdocdir}/network -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/bond-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/bond-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-bond-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/bridge-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/bridge-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-bridge-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/eth-simple-auto.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/eth-simple-auto.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-eth-simple-auto-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/eth-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/eth-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-eth-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/infiniband.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/infiniband.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-infiniband-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/macvlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/macvlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-macvlan-playbook.yml -cp $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/remove-profile.yml \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/remove-profile.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-remove-profile-playbook.yml -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/remove-profile.yml -cp $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/down-profile.yml \ +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/remove-profile.yml +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/down-profile.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-down-profile-playbook.yml -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/down-profile.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/inventory \ +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/down-profile.yml +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/inventory \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-inventory -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/.gitignore -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/tests/.gitignore -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/roles -rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/.gitignore +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/tests/.gitignore +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/roles +rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples %files %dir %{_datadir}/ansible %dir %{_datadir}/ansible/roles +%if 0%{?rolealtprefix:1} +%{_datadir}/ansible/roles/%{rolealtprefix}kdump +%{_datadir}/ansible/roles/%{rolealtprefix}postfix +%{_datadir}/ansible/roles/%{rolealtprefix}selinux +%{_datadir}/ansible/roles/%{rolealtprefix}timesync +%{_datadir}/ansible/roles/%{rolealtprefix}network +%endif %{_datadir}/ansible/roles/%{roleprefix}kdump +%{_datadir}/ansible/roles/%{roleprefix}postfix %{_datadir}/ansible/roles/%{roleprefix}selinux %{_datadir}/ansible/roles/%{roleprefix}timesync %{_datadir}/ansible/roles/%{roleprefix}network -%{_datadir}/ansible/roles/%{rolecompatprefix}kdump -%{_datadir}/ansible/roles/%{rolecompatprefix}selinux -%{_datadir}/ansible/roles/%{rolecompatprefix}timesync -%{_datadir}/ansible/roles/%{rolecompatprefix}network -# no examples for kdump yet -#%%doc %%{_pkgdocdir}/kdump/example-*-playbook.yml -%doc %{_pkgdocdir}/selinux/example-*-playbook.yml -%doc %{_pkgdocdir}/timesync/example-*-playbook.yml -%doc %{_pkgdocdir}/network/example-*-playbook.yml - +%doc %{_pkgdocdir}/*/example-*-playbook.yml %doc %{_pkgdocdir}/network/example-inventory -%doc %{_pkgdocdir}/kdump/README.md -%doc %{_pkgdocdir}/selinux/README.md -%doc %{_pkgdocdir}/timesync/README.md -%doc %{_pkgdocdir}/network/README.md -%doc %{_datadir}/ansible/roles/%{rolecompatprefix}kdump/README.md -%doc %{_datadir}/ansible/roles/%{rolecompatprefix}selinux/README.md -%doc %{_datadir}/ansible/roles/%{rolecompatprefix}timesync/README.md -%doc %{_datadir}/ansible/roles/%{rolecompatprefix}network/README.md +%doc %{_pkgdocdir}/*/README.md +%doc %{_datadir}/ansible/roles/%{roleprefix}kdump/README.md +%doc %{_datadir}/ansible/roles/%{roleprefix}postfix/README.md +%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.md +%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.md +%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.md %license %{_pkgdocdir}/*/COPYING %license %{_pkgdocdir}/*/LICENSE -%license %{_datadir}/ansible/roles/%{rolecompatprefix}kdump/COPYING -%license %{_datadir}/ansible/roles/%{rolecompatprefix}selinux/COPYING -%license %{_datadir}/ansible/roles/%{rolecompatprefix}timesync/COPYING -%license %{_datadir}/ansible/roles/%{rolecompatprefix}network/LICENSE - -%files techpreview -%dir %{_datadir}/ansible -%dir %{_datadir}/ansible/roles - -%{_datadir}/ansible/roles/%{roleprefix}postfix -%{_datadir}/ansible/roles/%{rolecompatprefix}postfix -# no examples for postfix yet -#%%doc %%{_pkgdocdir}/postfix/example-*-playbook.yml - -%doc %{_pkgdocdir}/postfix/README.md -%doc %{_datadir}/ansible/roles/%{rolecompatprefix}postfix/README.md -%license %{_datadir}/ansible/roles/%{rolecompatprefix}postfix/COPYING +%license %{_datadir}/ansible/roles/%{roleprefix}kdump/COPYING +%license %{_datadir}/ansible/roles/%{roleprefix}postfix/COPYING +%license %{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING +%license %{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING +%license %{_datadir}/ansible/roles/%{roleprefix}network/LICENSE %changelog +* Tue Nov 6 2018 Pavel Cahyna - 1.0-5 +- spec file improvement: Unify the source macros with deftag() and defcommit() +- Update to upstream released versions and drop unnecessary patches. +- Unify the spec file with Fedora (no functional changes intended). +- Misc spec file comments fixes (by Mike DePaulo) +- Fix rpmlint error by escaping a previous changelog entry with a macro (by Mike DePaulo) +- Comply with Fedora guidelines by always using "cp -p" in %%install (by Mike DePaulo) +- Rebase network role - doc improvements, Fedora 29 and Ansible 2.7 support +- Regenerate network role patch to apply without offset +- Rebase kdump role to fix a forgotten edit, rhbz#1645633 +- Update timesync examples: add var prefix (rhbz#1642152), correct role prefix + +* Thu Aug 16 2018 Pavel Cahyna - 1.0-4 +- Add Obsoletes for the -techpreview subpackage + +* Thu Aug 16 2018 Pavel Cahyna - 1.0-3 +- Add warnings to role READMEs and other doc updates, rhbz#1616018 +- network: split the state setting into state and persistent_state, rhbz#1616014 +- Undo the -techpreview subpackage introduced in 1.0-1, rhbz#1616015 + * Thu Aug 2 2018 Pavel Cahyna - 1.0-2 - Rebase the network role to the last revision (d866422). Many improvements to tests, introduces autodetection of the current provider