- adapterized

[packages/distcc.git] / distcc.spec

diff --git a/distcc.spec b/distcc.spec
index 9f0475d4116093906bcb19a34486f51aa912772d..bbf6028ae26cd13eaa8a35a5aa7c7501071e2482 100644 (file)
--- a/distcc.spec
+++ b/distcc.spec
@@ -24,6 +24,7 @@ BuildRequires:        automake
 %{?with_gnome:BuildRequires:   libgnomeui-devel >= 2.0}
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,7 +49,7 @@ Requires:     gcc-c++
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
-Requires(pre):         /usr/sbin/useradd
+Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Provides:      group(distcc)
@@ -94,8 +95,7 @@ Obsoletes:    distcc < 2.1-2
 distcc configs for running as a standalone daemon.
 
 %description standalone -l pl
-Pliki konfiguracyjne distcc do startowania demona w trybie
-standalone.
+Pliki konfiguracyjne distcc do startowania demona w trybie standalone.
 
 %package monitor
 Summary:       Monitor for distcc
@@ -131,7 +131,7 @@ cp -f /usr/share/automake/config.* .
 %{__autoheader}
 %configure \
        --enable-rfc2553 \
-       %{?with_gnome:--with-gnome} 
+       %{?with_gnome:--with-gnome}
 
 %{__make}
 
@@ -162,23 +162,8 @@ touch $RPM_BUILD_ROOT%{_var}/log/distcc
 rm -rf $RPM_BUILD_ROOT
 
 %pre common
-if [ -n "`/usr/bin/getgid distcc`" ]; then
-       if [ "`/usr/bin/getgid distcc`" != "137" ]; then
-               echo "Error: group distcc doesn't have gid=137. Correct this before installing distccd." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 137 distcc 1>&2
-fi
-if [ -n "`/bin/id -u distcc 2>/dev/null`" ]; then
-       if [ "`/bin/id -u distcc`" != "137" ]; then
-               echo "Error: user distcc doesn't have uid=137. Correct this before installing distccd server." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 137 -d /tmp -s /bin/false -c "distcc user" \
-               -g distcc distcc 1>&2
-fi
+%groupadd -P %{name}-common -g 137 distcc
+%useradd -P %{name}-common -u 137 -d /tmp -s /bin/false -c "distcc user" -g distcc distcc
 
 %postun common
 if [ "$1" = "0" ]; then
@@ -223,15 +208,15 @@ fi
 
 %files common
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/distccd
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/distccd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/distccd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/distccd
 %attr(755,root,root) %{_bindir}/%{name}d
 %{_mandir}/man?/%{name}d.*
 %attr(640,distcc,root) %ghost %{_var}/log/distcc
 
 %files inetd
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/distccd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/distccd
 
 %files standalone
 %defattr(644,root,root,755)