Browse code

Fix user man:man adding.

Change-Id: I77cf28f0870fc612fd7421e807420a7a4aa7c509
Reviewed-on: http://photon-jenkins.eng.vmware.com/876
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

xiaolin-vmware authored on 2016/05/17 06:30:43
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Programs for finding and viewing man pages
2 2
 Name:		man-db
3 3
 Version:	2.7.5
4
-Release:	2%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	GPLv2+
6 6
 URL:		http://www.nongnu.org/man-db
7 7
 Group:		Applications/System
... ...
@@ -41,30 +41,19 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
41 41
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
42 42
 
43 43
 %pre
44
-if [$1 -eq 1]; then
45
-    # This is first installation
46
-    if ! getent group man >/dev/null; then
47
-        groupadd -r man
48
-    fi
49
-    if ! getent passwd apache >/dev/null; then
50
-        useradd -c "man" -d /var/cache/man -g man \
51
-            -s /bin/false -M -r man
52
-    fi
53
-fi
44
+
45
+getent group man >/dev/null || groupadd -r man
46
+getent passwd man >/dev/null || useradd -c "man" -d /var/cache/man -g man \
47
+        -s /bin/false -M -r man
54 48
 
55 49
 %post -p /sbin/ldconfig
56 50
 
57 51
 %postun
58
-/sbin/ldconfig
59
-if [$1 -eq 0];then
60
-    # This is delete operation
61
-    if getent passwd man >/dev/null; then
62
-        userdel man
63
-    fi
64
-    if getent group man >/dev/null; then
65
-        groupdel man
66
-    fi
52
+if [ $1 -eq 0 ] ; then
53
+	getent passwd man >/dev/null && userdel man
54
+	getent group man >/dev/null && groupdel man
67 55
 fi
56
+/sbin/ldconfig
68 57
 
69 58
 %files -f %{name}.lang
70 59
 %defattr(-,root,root)
... ...
@@ -77,6 +66,8 @@ fi
77 77
 %{_mandir}/*/*
78 78
 %{_libdir}/tmpfiles.d/man-db.conf
79 79
 %changelog
80
+*   Mon May 16 2016 Xiaolin Li <xiaolinl@vmware.com> 2.7.5-3
81
+-   Fix user man:man adding.
80 82
 *       Thu May 05 2016 Kumar Kaushik <kaushikk@vmware.com> 2.7.5-2
81 83
 -       Adding support for upgrade in pre/post/un scripts.
82 84
 *       Wed Feb 24 2016 Kumar Kaushik <kaushikk@vmware.com> 2.7.5-1