[Zenoss-commit] r8495 - trunk/inst/rpm

[<sv...@ze...>]

Author: chris
Date: 2008-02-29 15:06:27 -0500 (Fri, 29 Feb 2008)
New Revision: 8495

Modified:
   trunk/inst/rpm/zenoss.spec
Log:
* promote chkconfig --add to be run every time we install/upgrade
* add a chkconfig --del to preun
* remove some blank spaces in the metadata
* add URL field


Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec	2008-02-29 19:49:58 UTC (rev 8494)
+++ trunk/inst/rpm/zenoss.spec	2008-02-29 20:06:27 UTC (rev 8495)
@@ -44,15 +44,16 @@
 %define _unpackaged_files_terminate_build 0
 
 # the RPM meta information
-Name:     zenoss
-Summary:  The Open Source Network Management System
+Name: zenoss
+Summary: The Open Source Network Management System
+URL: http://www.zenoss.com/
 Version: 2.0.2
 Release: 0
-License:  GPLv2
-Vendor:   Zenoss, Inc.
+License: GPLv2
+Vendor: Zenoss, Inc.
 Packager: Christopher Blunck <ch...@ze...>
-Group:    Applications/System
-Source0:  %{name}-%{version}-%{release}.tar.bz2
+Group: Applications/System
+Source0: %{name}-%{version}-%{release}.tar.bz2
 Requires(pre): shadow-utils
 BuildRequires: gcc-c++ 
 BuildRequires: gcc 
@@ -64,7 +65,7 @@
 BuildRequires: swig >= 1.3
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: net-snmp
-Provides: zenoss
+# additional provides
 # distro-specific requires
 
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -341,6 +342,9 @@
 append LD_LIBRARY_PATH %{zenhome}/lib ${bashrc}
 chown %{os_username} ${bashrc}
 
+# set up symlinks for all the runlevels
+chkconfig --add zenoss
+
 # run these commands when installing, but not upgrading or reinstalling
 if [ $1 -eq 1 ]; then
     # set environment variables
@@ -349,9 +353,6 @@
     export OS_HOME=%{os_home}
     export OS_SHELL=%{os_shell}
 
-    # set up symlinks for all the runlevels
-    chkconfig --add zenoss
-
     # update the files to be setuid
     setuid
 
@@ -382,7 +383,10 @@
 # kill off any zeo/zope/zen processes that are running
 kill_running
 
+# remove symlinks for all the runlevels
+chkconfig --del zenoss
 
+
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 %postun
 # called when we are erasing the package (but not upgrading)