Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	nrpe.spec
@@ -122,7 +122,7 @@ mkdir selinux install -pm 644 %{SOURCE3} README.SELinux.rst %if 0%{?rhel} < 7 -cp -p %{SOURCE4} selinux/%my{name}_epel.te +cp -p %{SOURCE4} selinux/%{myname}_epel.te %else cp -p %{SOURCE5} selinux/%{myname}_epel.te %endif @@ -171,8 +171,8 @@ %preun %if 0%{?el6} if [ $1 = 0 ]; then - /sbin/service %{name} stop > /dev/null 2>&1 \|\| : - /sbin/chkconfig --del %{name} \|\| : + /sbin/service %{myname} stop > /dev/null 2>&1 \|\| : + /sbin/chkconfig --del %{myname} \|\| : fi %else %systemd_preun nrpe.service @@ -180,7 +180,7 @@ %post %if 0%{?el6} -/sbin/chkconfig --add %{name} \|\| : +/sbin/chkconfig --add %{myname} \|\| : %else %systemd_post nrpe.service %endif @@ -188,7 +188,7 @@ %postun %if 0%{?el6} if [ "$1" -ge "1" ]; then - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : fi %else %systemd_postun_with_restart nrpe.service @@ -198,15 +198,15 @@ %post selinux %if 0%{?el6} if [ "$1" -le "1" ]; then # Fist install - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : fixfiles -R %{name} restore \|\| : - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : fi %else if [ "$1" -le "1" ]; then # Fist install - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : fixfiles -R %{name} restore \|\| : - %systemd_postun_with_restart %{name}.service + %systemd_postun_with_restart %{myname}.service fi %endif %endif @@ -215,15 +215,15 @@ %preun selinux %if 0%{?el6} if [ "$1" -lt "1" ]; then # Final removal - semodule -r %{name}_epel 2>/dev/null \|\| : + semodule -r %{myname}_epel 2>/dev/null \|\| : fixfiles -R %{name} restore \|\| : - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : fi %else if [ "$1" -lt "1" ]; then # Final removal - semodule -r %{name}_epel 2>/dev/null \|\| : + semodule -r %{myname}_epel 2>/dev/null \|\| : fixfiles -R %{name} restore \|\| : - %systemd_postun_with_restart %{name}.service + %systemd_postun_with_restart %{myname}.service fi %endif %endif @@ -232,7 +232,7 @@ %postun selinux if [ "$1" -ge "1" ]; then # Upgrade # Replaces the module if it is already loaded - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : # no need to restart the daemon fi %endif @@ -241,19 +241,19 @@ %if 0%{?el6} %{_initrddir}/nrpe %else -%{_unitdir}/%{name}.service +%{_unitdir}/%{myname}.service %endif %config(noreplace) %{_sysconfdir}/xinetd.d/nrpe %{_sbindir}/nrpe %dir %{_sysconfdir}/nrpe.d %dir %{_sysconfdir}/nagios/nrpe.d %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{myname} %if 0%{?fedora} > 14 \|\| 0%{?rhel} > 6 -%config(noreplace) %{_tmpfilesdir}/%{name}.conf +%config(noreplace) %{_tmpfilesdir}/%{myname}.conf %endif %doc CHANGELOG.md LICENSE.md LEGAL README.md README.SSL.md SECURITY.md docs/NRPE.pdf -%dir %attr(775, %{name}, %{name}) %{_localstatedir}/run/%{name} +%dir %attr(775, %{nsusr}, %{nsgrp}) %{_localstatedir}/run/%{myname} %files -n nagios-plugins-nrpe3 %{_libdir}/nagios/plugins/check_nrpe3 @@ -262,7 +262,7 @@ %if 0%{?rhel} > 5 %files selinux %doc README.SELinux.rst -%{_datadir}/selinux/packages/%{name}/%{name}_epel.pp +%{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp %endif %changelog x 1 @@ -122,7 +122,7 @@ 2 mkdir selinux 3 install -pm 644 %{SOURCE3} README.SELinux.rst 4 %if 0%{?rhel} < 7 5 -cp -p %{SOURCE4} selinux/%my{name}_epel.te 6 +cp -p %{SOURCE4} selinux/%{myname}_epel.te 7 %else 8 cp -p %{SOURCE5} selinux/%{myname}_epel.te 9 %endif 10 @@ -171,8 +171,8 @@ 11 %preun 12 %if 0%{?el6} 13 if [ $1 = 0 ]; then 14 - /sbin/service %{name} stop > /dev/null 2>&1 \|\| : 15 - /sbin/chkconfig --del %{name} \|\| : 16 + /sbin/service %{myname} stop > /dev/null 2>&1 \|\| : 17 + /sbin/chkconfig --del %{myname} \|\| : 18 fi 19 %else 20 %systemd_preun nrpe.service 21 @@ -180,7 +180,7 @@ 22 23 %post 24 %if 0%{?el6} 25 -/sbin/chkconfig --add %{name} \|\| : 26 +/sbin/chkconfig --add %{myname} \|\| : 27 %else 28 %systemd_post nrpe.service 29 %endif 30 @@ -188,7 +188,7 @@ 31 %postun 32 %if 0%{?el6} 33 if [ "$1" -ge "1" ]; then 34 - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : 35 + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : 36 fi 37 %else 38 %systemd_postun_with_restart nrpe.service 39 @@ -198,15 +198,15 @@ 40 %post selinux 41 %if 0%{?el6} 42 if [ "$1" -le "1" ]; then # Fist install 43 - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : 44 + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : 45 fixfiles -R %{name} restore \|\| : 46 - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : 47 + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : 48 fi 49 %else 50 if [ "$1" -le "1" ]; then # Fist install 51 - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : 52 + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : 53 fixfiles -R %{name} restore \|\| : 54 - %systemd_postun_with_restart %{name}.service 55 + %systemd_postun_with_restart %{myname}.service 56 fi 57 %endif 58 %endif 59 @@ -215,15 +215,15 @@ 60 %preun selinux 61 %if 0%{?el6} 62 if [ "$1" -lt "1" ]; then # Final removal 63 - semodule -r %{name}_epel 2>/dev/null \|\| : 64 + semodule -r %{myname}_epel 2>/dev/null \|\| : 65 fixfiles -R %{name} restore \|\| : 66 - /sbin/service %{name} condrestart > /dev/null 2>&1 \|\| : 67 + /sbin/service %{myname} condrestart > /dev/null 2>&1 \|\| : 68 fi 69 %else 70 if [ "$1" -lt "1" ]; then # Final removal 71 - semodule -r %{name}_epel 2>/dev/null \|\| : 72 + semodule -r %{myname}_epel 2>/dev/null \|\| : 73 fixfiles -R %{name} restore \|\| : 74 - %systemd_postun_with_restart %{name}.service 75 + %systemd_postun_with_restart %{myname}.service 76 fi 77 %endif 78 %endif 79 @@ -232,7 +232,7 @@ 80 %postun selinux 81 if [ "$1" -ge "1" ]; then # Upgrade 82 # Replaces the module if it is already loaded 83 - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null \|\| : 84 + semodule -i %{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 2>/dev/null \|\| : 85 # no need to restart the daemon 86 fi 87 %endif 88 @@ -241,19 +241,19 @@ 89 %if 0%{?el6} 90 %{_initrddir}/nrpe 91 %else 92 -%{_unitdir}/%{name}.service 93 +%{_unitdir}/%{myname}.service 94 %endif 95 %config(noreplace) %{_sysconfdir}/xinetd.d/nrpe 96 %{_sbindir}/nrpe 97 %dir %{_sysconfdir}/nrpe.d 98 %dir %{_sysconfdir}/nagios/nrpe.d 99 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg 100 -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} 101 +%config(noreplace) %{_sysconfdir}/sysconfig/%{myname} 102 %if 0%{?fedora} > 14 \|\| 0%{?rhel} > 6 103 -%config(noreplace) %{_tmpfilesdir}/%{name}.conf 104 +%config(noreplace) %{_tmpfilesdir}/%{myname}.conf 105 %endif 106 %doc CHANGELOG.md LICENSE.md LEGAL README.md README.SSL.md SECURITY.md docs/NRPE.pdf 107 -%dir %attr(775, %{name}, %{name}) %{_localstatedir}/run/%{name} 108 +%dir %attr(775, %{nsusr}, %{nsgrp}) %{_localstatedir}/run/%{myname} 109 110 %files -n nagios-plugins-nrpe3 111 %{_libdir}/nagios/plugins/check_nrpe3 112 @@ -262,7 +262,7 @@ 113 %if 0%{?rhel} > 5 114 %files selinux 115 %doc README.SELinux.rst 116 -%{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 117 +%{_datadir}/selinux/packages/%{myname}/%{myname}_epel.pp 118 %endif 119 120 %changelog 121