- %%userremove/%%groupremove support, some unification

Changed files:
    dbus.spec -> 1.33

diff --git a/dbus.spec b/dbus.spec
index 762acbdb536b9106e7e57088e6123c4076fb4a14..fc19ac482f578e730446d7e7523568063f31331f 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -53,16 +53,19 @@ BuildRequires:      python-devel >= 2.2
 Buildrequires: python-Pyrex >= 0.9.3
 %endif
 %{?with_qt:BuildRequires:      qt-devel    >= %{qt_version}}
+BuildRequires: rpmbuild(macros) >= 1.159
 PreReq:        rc-scripts
 Requires:      %{name}-libs = %{version}-%{release}
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,postun): /sbin/ldconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+Provides:      group(messagebus)
+Provides:      user(messagebus)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -348,20 +351,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 if [ -n "`/usr/bin/getgid messagebus`" ]; then
-       if [ "`getgid messagebus`" != "122" ]; then
+       if [ "`/usr/bin/getgid messagebus`" != 122 ]; then
                echo "Error: group messagebus doesn't have gid=122. Correct this before installing dbus." 1>&2
                exit 1
        fi
 else
-       /usr/sbin/groupadd -g 122 -r -f messagebus
+       /usr/sbin/groupadd -g 122 messagebus 1>&2
 fi
 if [ -n "`/bin/id -u messagebus 2>/dev/null`" ]; then
-       if [ "`/bin/id -u messagebus`" != "122" ]; then
+       if [ "`/bin/id -u messagebus`" != 122 ]; then
                echo "Error: user messagebus doesn't have uid=122. Correct this before installing dbus." 1>&2
                exit 1
        fi
 else
-       /usr/sbin/useradd -u 122 -r -d /usr/share/empty -s /bin/false -c "System message bus" -g messagebus messagebus 1>&2
+       /usr/sbin/useradd -u 122 -d /usr/share/empty -s /bin/false \
+               -c "System message bus" -g messagebus messagebus 1>&2
 fi
 
 %post
@@ -382,8 +386,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel messagebus
-       /usr/sbin/groupdel messagebus
+       %userremove messagebus
+       %groupremove messagebus
 fi
 
 %post   libs -p /sbin/ldconfig