From 9a1c5ee548148f2e2f633c7c526491d8c918a098 Mon Sep 17 00:00:00 2001
From: root <root@wp.san.ru>
Date: Mon, 1 Feb 2010 12:22:12 +0300
Subject: [PATCH] - update .spec file; - cosmetic in init.d scripts

---
 doc/init.d.RedHat/etc/init.d/uhub |  4 ++--
 doc/uhub.spec                     | 28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/doc/init.d.RedHat/etc/init.d/uhub b/doc/init.d.RedHat/etc/init.d/uhub
index f7db25c..d263ab2 100755
--- a/doc/init.d.RedHat/etc/init.d/uhub
+++ b/doc/init.d.RedHat/etc/init.d/uhub
@@ -38,7 +38,7 @@ RETVAL=0
 
 
 start() {
-        KIND="UHUB"
+        KIND="Uhub"
 	echo -n $"Starting $KIND services: "
 	daemon uhub $UHUBOPTIONS
 	RETVAL=$?
@@ -47,7 +47,7 @@ start() {
 }	
 
 stop() {
-        KIND="UHUB"
+        KIND="Uhub"
 	echo -n $"Shutting down $KIND services: "
 	killproc uhub
 	RETVAL=$?
diff --git a/doc/uhub.spec b/doc/uhub.spec
index e81a5c0..42928c6 100644
--- a/doc/uhub.spec
+++ b/doc/uhub.spec
@@ -1,9 +1,9 @@
 Summary: High performance ADC p2p hub.
 Name: uhub
 Version: 0.3.0 
-Release: 1
-License: GPL
-Group: Applications/Internet
+Release: 3
+License: GPLv3
+Group: Networking/File transfer
 Source: uhub-%{version}.tar.gz
 URL: http://www.uhub.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -27,7 +27,6 @@ Key features:
 
 %build
 echo RPM_BUILD_ROOT = $RPM_BUILD_ROOT
-make clean
 make
 
 %install
@@ -40,12 +39,12 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
 
 install uhub $RPM_BUILD_ROOT/usr/bin/
 > doc/motd.txt
-install doc/uhub.conf doc/users.conf doc/rules.txt doc/motd.txt $RPM_BUILD_ROOT/etc/uhub
+install -m644 doc/uhub.conf doc/users.conf doc/rules.txt doc/motd.txt $RPM_BUILD_ROOT/etc/uhub
 install doc/init.d.RedHat/etc/init.d/uhub $RPM_BUILD_ROOT/etc/init.d
-install doc/init.d.RedHat/etc/sysconfig/uhub  $RPM_BUILD_ROOT/etc/sysconfig/
-install doc/init.d.RedHat/etc/logrotate.d/uhub $RPM_BUILD_ROOT/etc/logrotate.d/
+install -m644 doc/init.d.RedHat/etc/sysconfig/uhub  $RPM_BUILD_ROOT/etc/sysconfig/
+install -m644 doc/init.d.RedHat/etc/logrotate.d/uhub $RPM_BUILD_ROOT/etc/logrotate.d/
 /bin/gzip -9c doc/uhub.1 > doc/uhub.1.gz &&
-install doc/uhub.1.gz $RPM_BUILD_ROOT/usr/share/man/man1
+install -m644 doc/uhub.1.gz $RPM_BUILD_ROOT/usr/share/man/man1
 
 
 %files
@@ -64,15 +63,22 @@ install doc/uhub.1.gz $RPM_BUILD_ROOT/usr/share/man/man1
 
 
 %clean
-make clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/chkconfig --add uhub
+if [ $1 -gt 1 ] ; then
+    /etc/rc.d/init.d/uhub restart >/dev/null || :
+fi
 # need more informations about add services and users in system
-#chkconfig uhub on
-#adduser -M -d /tmp -G nobody -s /sbin/nologin uhub
+/usr/sbin/adduser -M -d /tmp -G nobody -s /sbin/nologin -c 'The Uhub ADC p2p hub Daemon' uhub >/dev/null 2>&1 ||:
 
 %changelog
+* Tue Jan 31 2010 E_zombie
+- change GROUP
+- chmod for files
+- add postinstall scripts
+- fix "License"
 * Tue Jan 26 2010 E_zombie
 - first .spec release