Logoj0ke.net Open Build Service > Projects > home:jg:playground > heartbeat > Changes
Sign Up | Log In

Changes of Revision 12

[-] Changed heartbeat.spec
x
 
1
@@ -34,8 +34,6 @@
2
 %endif
3
 Requires:         ldirectord = %{version}-%{release}
4
 Requires:         pygtk2 >= 2.4
5
-Requires(pre):    fedora-usermgmt
6
-Requires(postun): fedora-usermgmt
7
 Requires(post):   /sbin/chkconfig
8
 Requires(preun):  /sbin/chkconfig
9
 %if %{ENABLE_MGMT}
10
@@ -161,8 +159,8 @@
11
 rm -rf $RPM_BUILD_ROOT
12
 
13
 %pre
14
-/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || :
15
-/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \
16
+/usr/sbin/groupadd %{uid} -r %{gname} &>/dev/null || :
17
+/usr/sbin/useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \
18
         -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || :
19
 
20
 %post
21
@@ -178,8 +176,8 @@
22
 fi
23
 
24
 /sbin/ldconfig
25
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
26
-test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
27
+test "$1" != 0 || /usr/sbin/userdel  %{uname} &>/dev/null || :
28
+test "$1" != 0 || /usr/sbin/groupdel %{gname} &>/dev/null || :
29
 
30
 %post -n ldirectord
31
 /sbin/chkconfig --add ldirectord
32