rpms/Perlbal/devel Perlbal.spec, 1.11, 1.12 perlbal.init, 1.1, 1.2 sources, 1.5, 1.6

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/Perlbal/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8651

Modified Files:
	Perlbal.spec perlbal.init sources 
Log Message:
* Tue Jun 22 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.76-1
- Upstream released new version: http://cpansearch.perl.org/src/DORMANDO/Perlbal-1.76/CHANGES
- Minor spec and initscript cleanup



Index: Perlbal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/Perlbal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Perlbal.spec	1 Jun 2010 21:28:32 -0000	1.11
+++ Perlbal.spec	22 Jun 2010 12:19:45 -0000	1.12
@@ -1,13 +1,12 @@
 Name:           Perlbal
-Version:        1.75
-Release:        2%{?dist}
+Version:        1.76
+Release:        1%{?dist}
 Summary:        Reverse-proxy load balancer and webserver
 License:        GPL+ or Artistic
 Group:          System Environment/Daemons
 URL:            http://search.cpan.org/dist/Perlbal/
-Source0:        http://search.cpan.org/CPAN/authors/id/B/BR/BRADFITZ/%{name}-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DO/DORMANDO/%{name}-%{version}.tar.gz
 Source1:        perlbal.init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:    perl(ExtUtils::MakeMaker)
@@ -23,9 +22,9 @@ Requires:         perl(IO::AIO)
 Requires:         perl(BSD::Resource)
 Requires:         perl(Perlbal::XS::HTTPHeaders)
 
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/service
+Requires(post):   chkconfig
+Requires(preun):  chkconfig, initscripts
+Requires(postun): chkconfig
 
 %description
 Perlbal is a single-threaded event-based server supporting HTTP load 
@@ -41,16 +40,13 @@ Perlbal can also be extended by means of
 can override many parts of request handling and behavior.
 
 %prep
-%setup -q -n Perlbal-%{version}
+%setup -q
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
-
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
@@ -59,21 +55,18 @@ find %{buildroot} -depth -type d -exec r
 %{_fixperms} %{buildroot}/*
 
 install -D -p -m 0644 conf/webserver.conf %{buildroot}%{_sysconfdir}/perlbal/perlbal.conf
-install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/perlbal
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/perlbal
 mkdir -p doc/examples
 mv conf/* doc/examples
 
 %check
 make test
 
-%clean
-rm -rf %{buildroot}
-
 %post
 /sbin/chkconfig --add perlbal
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del perlbal
     /sbin/service perlbal stop >/dev/null 2>&1 || :
 fi
@@ -87,7 +80,7 @@ fi
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/perlbal
 %config(noreplace) %{_sysconfdir}/perlbal/perlbal.conf
-%{_initrddir}/perlbal
+%{_initddir}/perlbal
 %doc CHANGES doc/*
 %{perl_vendorlib}/*
 %{_bindir}/perlbal
@@ -96,6 +89,10 @@ fi
 
 
 %changelog
+* Tue Jun 22 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.76-1
+- Upstream released new version: http://cpansearch.perl.org/src/DORMANDO/Perlbal-1.76/CHANGES
+- Minor spec and initscript cleanup
+
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.75-2
 - Mass rebuild with perl-5.12.0
 


Index: perlbal.init
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/perlbal.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perlbal.init	6 Aug 2007 19:12:28 -0000	1.1
+++ perlbal.init	22 Jun 2010 12:19:45 -0000	1.2
@@ -15,21 +15,22 @@
 # source function library
 . /etc/rc.d/init.d/functions
 
-RETVAL=0
-
 start() {
 	echo -n $"Starting Perlbal: "
 	daemon perlbal --daemon
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/perlbal
+	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping Perlbal: "
 	killproc perlbal
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/perlbal
+	return $RETVAL
 }
 
 restart() {
@@ -52,11 +53,10 @@ case "$1" in
 	;;
   status)
 	status perlbal
-	RETVAL=$?
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-	exit 1
+	exit 2
 esac
 
-exit $RETVAL
+exit $?


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Apr 2010 13:56:25 -0000	1.5
+++ sources	22 Jun 2010 12:19:45 -0000	1.6
@@ -1 +1 @@
-38f4af5d6cf6dba4c00916058e80aa94  Perlbal-1.75.tar.gz
+48c3f9501d3643c768e67fb75c7e039a  Perlbal-1.76.tar.gz