rapid-tunneling: spec: user is created in -gui

* Only create rapid-tunneling user in scripts of -gui
* Don't delete created users (rpmlint, Elad)
* Dependency and misc. cleanups (rpmlint, Elad)
* License is GPL2+ (Elad)


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@9426 283159da-0705-0410-b60c-f2062b4bb6ad

1 files changed, 17 insertions, 24 deletions

diff --git a/rapid-tunneling.spec b/rapid-tunneling.spec
index 2e04a4c..77adfa6 100644
--- a/rapid-tunneling.spec
+++ b/rapid-tunneling.spec
@@ -2,12 +2,12 @@ Summary: Xorcom RapidTunneling (tm)
 Name: rapid-tunneling
 Version: 1.11
 Release: 1
-License: GPLv2
+License: GPLv2+
 Group: Applications/Internet
 URL: http://www.xorcom.com/
 Source: rapid-tunneling-%{version}.tar.gz
 #BuildRequires: asciidoc
-Requires: openssh-clients busybox gnupg
+Requires: openssh-clients busybox
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -18,7 +18,7 @@ and NAT routers via SSH port forwarding.
 %package server
 Summary: Server part of RapidTunneling
 Group: Applications/Internet
-Requires: openssh-server
+Requires: openssh-server shadow-utils
 
 %description server
 This package contains the server files needed to run RapidTunneling Server.
@@ -43,7 +43,7 @@ make
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 # The placeholder is needed for debs, but creates an unnecessary file 
 # conflicts on rpm:
 %{__rm} -f %{buildroot}/var/lib/rapid-tunneling/.placeholder
@@ -51,36 +51,25 @@ make
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-# add a user with uid=gid=0
-if ! getent passwd rapid-tunneling >/dev/null ; then
-    useradd -d /var/lib/rapid-tunneling/home -m -u 0 -g 0 -o rapid-tunneling
-fi
-
-%preun
-if [ "$1" = 0 ]; then
-	userdel -r rapid-tunneling || :
-fi
-
 %post server
 HOME_DIR=/var/lib/rapid-tunneling/support
 NEW_USER=support
-useradd -d $HOME_DIR -m $NEW_USER 2>/dev/null || :
+NEW_GROUP=$NEW_USER
+getent group $NEW_GROUP >/dev/null || groupadd -r $NEW_GROUP
+getent passwd $NEW_USER >/dev/null || \
+    useradd -r -g $NEW_GROUP -d $HOME_DIR \
+    -c "RapidTunneling support user" $NEW_USER
 LINE='. /usr/share/rapid-tunneling/support_env'
 PROFILE=$HOME_DIR/.bash_profile
 if ! fgrep -q "$LINE" $PROFILE 2>/dev/null; then 
 	echo "$LINE" >> $PROFILE 
 fi
 
-%preun server
-if [ "$1" = 0 ]; then
-	userdel support || :
-fi
-
-%postun server
-/sbin/service sshd_support condrestart > /dev/null 2>&1 || :
-
 %post gui
+# add a user with uid=gid=0
+if ! getent passwd rapid-tunneling >/dev/null ; then
+    useradd -d /var/lib/rapid-tunneling/home -m -u 0 -g 0 -o rapid-tunneling
+fi
 SUDOERS=/etc/sudoers
 user="asterisk"
 TEXT="Defaults>$user !lecture
@@ -127,6 +116,10 @@ service httpd reload
 
 %changelog
 * Tue Jun 14 2011 Tzafrir Cohen <tzafrir.cohen@xorcom.com> 1.11-1
+- Only create rapid-tunneling user in scripts of -gui
+- Don't delete created users (rpmlint, Elad)
+- Dependency and misc. cleanups (rpmlint, Elad)
+- License is GPL2+ (Elad)
 - Do include README and upstream Changelog.
 
 * Sun Oct  3 2010 Tzafrir Cohen <tzafrir.cohen@xorcom.com> 1.10-1