[Nagios-checkins] nsca Changelog,1.15,1.16 nsca.spec,1.1,1.2 update-version,1.2,1.3

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nsca
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23623

Modified Files:
	Changelog nsca.spec update-version 
Log Message:
Spec file fix

Index: Changelog
===================================================================
RCS file: /cvsroot/nagios/nsca/Changelog,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Changelog	22 Jan 2006 00:14:55 -0000	1.15
--- Changelog	23 Jan 2006 01:18:50 -0000	1.16
***************
*** 4,7 ****
--- 4,12 ----
  
  
+ 2.6 - ??/??/2006
+ ----------------
+ - Spec file fix
+ 
+ 
  2.5 - 01/21/2006
  ----------------

Index: nsca.spec
===================================================================
RCS file: /cvsroot/nagios/nsca/nsca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nsca.spec	3 Feb 2004 01:27:54 -0000	1.1
--- nsca.spec	23 Jan 2006 01:18:50 -0000	1.2
***************
*** 1,4 ****
  %define name nsca
! %define version 2.4
  %define release 1
  %define nsusr nagios
--- 1,4 ----
  %define name nsca
! %define version 2.5
  %define release 1
  %define nsusr nagios
***************
*** 118,124 ****
  %install
  [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
! install -b -D -m 0644 nsca.cfg ${RPM_BUILD_ROOT}/etc/nagios/nsca.cfg
! install -b -D -m 0644 send_nsca.cfg ${RPM_BUILD_ROOT}/etc/nagios/send_nsca.cfg
! install -b -D -m 0644 nsca.xinetd ${RPM_BUILD_ROOT}/etc/xined.d/nsca
  install -b -D -m 0755 src/nsca ${RPM_BUILD_ROOT}/usr/sbin/nsca
  install -b -D -m 0755 src/send_nsca ${RPM_BUILD_ROOT}/usr/bin/send_nsca
--- 118,124 ----
  %install
  [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
! install -b -D -m 0644 sample-config/nsca.cfg ${RPM_BUILD_ROOT}/etc/nagios/nsca.cfg
! install -b -D -m 0644 sample-config/send_nsca.cfg ${RPM_BUILD_ROOT}/etc/nagios/send_nsca.cfg
! install -b -D -m 0644 sample-config/nsca.xinetd ${RPM_BUILD_ROOT}/etc/xined.d/nsca
  install -b -D -m 0755 src/nsca ${RPM_BUILD_ROOT}/usr/sbin/nsca
  install -b -D -m 0755 src/send_nsca ${RPM_BUILD_ROOT}/usr/bin/send_nsca

Index: update-version
===================================================================
RCS file: /cvsroot/nagios/nsca/update-version,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** update-version	15 Oct 2003 23:17:45 -0000	1.2
--- update-version	23 Jan 2006 01:18:50 -0000	1.3
***************
*** 24,25 ****
--- 24,28 ----
  perl -i -p -e "s/PKG_VERSION=.*/PKG_VERSION=\"$1\"/;" configure.in
  perl -i -p -e "s/PKG_REL_DATE=.*\"/PKG_REL_DATE=\"$SHORTDATE\"/;" configure.in
+ 
+ # Update RPM spec file with version number
+ perl -i -p -e "s/%define version .*/%define version $1/;" nsca.spec