Author: glen                         Date: Mon Mar 17 15:22:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds if you "gdb> call _exit(0)" for bad /bin/ping call

---- Files affected:
SPECS:
   zenoss.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/zenoss.spec
diff -u SPECS/zenoss.spec:1.1 SPECS/zenoss.spec:1.2
--- SPECS/zenoss.spec:1.1       Mon Mar 17 11:43:16 2008
+++ SPECS/zenoss.spec   Mon Mar 17 16:22:49 2008
@@ -1,7 +1,25 @@
 # $Revision$, $Date$
 # TODO
+# - split build/install
 # - FHS
 # - use system Zope 2.8.8
+# - TwistedSNMP-0.3.13
+# - pysnmp-3.4.3
+# - Twisted-2.5.0
+# - TwistedCore-2.5.0
+# - pycrypto-1.9a6
+# - pynetsnmp-0.27.0
+# - ctypes-1.0.1
+# - MySQL-python-1.2.0
+# - rrdtool-1.2.23
+# - epydoc-3.0beta1
+# - python-snpp-1.1.1
+# - Yapps-2.1.1
+# - nagios-plugins-1.4.5
+# - libsmi-0.4.5
+# - wmi-0.1.5
+# - pyip-0.7
+# - simplejson-1.4
 
 # the location where zenoss is installed
 %define zenhome /opt/zenoss
@@ -39,7 +57,7 @@
 Summary:       The Open Source Network Management System
 Name:          zenoss
 Version:       2.1.3
-Release:       0.el5
+Release:       1.1
 License:       GPL
 Group:         Management/Network
 Source0:       http://dl.sourceforge.net/zenoss/%{name}-%{version}-0.tar.gz
@@ -88,6 +106,8 @@
 %setup -q
 
 %build
+
+%install
 replace() {
     SEARCH=$1
     REPLACE=$2
@@ -143,7 +163,7 @@
 mkdir -p $ZEN_INST_DIR/etc
 cp $CONF_DIR/snmpd.conf $ZEN_INST_DIR/etc
 cp $CONF_DIR/my.cnf $ZEN_INST_DIR/etc
-mkdir $ZEN_INST_DIR/log
+install -d $ZEN_INST_DIR/log
 
 # land the zenctl into the init.d directory as "zenoss"
 INIT_SCRIPT_DIR=$RPM_BUILD_ROOT%{_initrddir}
@@ -156,17 +176,17 @@
 cp $RPM_BUILD_ROOT/%{zenhome}/bin/zenctl ${START_SCRIPT}
 
 for file in \
-       ${START_SCRIPT} \
-       ${INIT_PRE_SCRIPT} \
-       ${INIT_POST_SCRIPT} \
-       ${UPGRADE_PRE_SCRIPT} \
-       ${UPGRADE_POST_SCRIPT}
+       $START_SCRIPT \
+       $INIT_PRE_SCRIPT \
+       $INIT_POST_SCRIPT \
+       $UPGRADE_PRE_SCRIPT \
+       $UPGRADE_POST_SCRIPT
 do
        replace "\*\*OS_USERNAME\*\*" "%{os_username}" ${file}
        replace "\*\*OS_UID\*\*" "%{os_uid}" ${file}
        replace "\*\*ZENHOME\*\*" "%{zenhome}" ${file}
        replace "\*\*MYSQL_HOST\*\*" "localhost" ${file}
-       replace "\*\*MYSQL_ROOT_USERNAME\*\*" "root" ${file}
+       replace "\*\*MYSQL_ROOT_USERNAME\*\*" "mysql" ${file}
        replace "\*\*MYSQL_ROOT_PASSWD\*\*" "" ${file}
        replace "\*\*MYSQL_HOST\*\*" "localhost" ${file}
        replace "\*\*MYSQL_USERNAME\*\*" "%{mysql_username}" ${file}
@@ -176,7 +196,7 @@
        replace "\*\*SNMPD_CONF\*\*" "%{snmpd_conf}" ${file}
        replace "\*\*MY_CNF\*\*" "%{my_cnf}" ${file}
        replace "\*\*ZOPEHOME\*\*" "%{zopehome}" ${file}
-       chmod +x ${file}
+       chmod +x $file
 done
 
 # copy the [install,shared]-functions because they are used by zenoss_init
@@ -185,19 +205,17 @@
 
 # copy filesystem scripts to the real filesystem
 cd $ZEN_BUILD_DIR/extras/etc
-for file in $(find -type f | grep -v .svn) do;
-       DEST=$RPM_BUILD_ROOT/etc/${file}
-    DIR=$(dirname $DEST)
+for file in $(find -type f | grep -v .svn); do
+       DEST=$RPM_BUILD_ROOT/etc/$file
+       DIR=$(dirname $DEST)
        if [ ! -d $DIR ]; then
                mkdir -p $DIR
        fi
 
-    cp ${file} ${DEST}
-    replace "\*\*ZENHOME\*\*" "%{zenhome}" ${DEST}
+       cp $file $DEST
+       replace "\*\*ZENHOME\*\*" "%{zenhome}" $DEST
 done
 
-%install
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -304,7 +322,7 @@
                %{zenhome}/.fresh_install \
                %{zenhome}/.upgraded
        do
-               rm -rf ${target}
+               rm -rf $target
        done
 fi
 
@@ -327,6 +345,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008-03-17 15:22:49  glen
+- builds if you "gdb> call _exit(0)" for bad /bin/ping call
+
 Revision 1.1  2008-03-17 10:43:16  glen
 - initial pldization from spec from zenoss-2.1.3-0.el5.src.rpm
-
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zenoss.spec?r1=1.1&r2=1.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to