rpms/firebird/EL-4 .cvsignore, 1.3, 1.4 firebird-fix-initscript.patch, 1.3, 1.4 firebird.spec, 1.6, 1.7 sources, 1.3, 1.4

[Philippe Makowski]

Author: makowski

Update of /cvs/pkgs/rpms/firebird/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12228

Modified Files:
	.cvsignore firebird-fix-initscript.patch firebird.spec sources 
Log Message:
* Mon Mar 01 2010 Philippe Makowski <makowski at fedoraproject.org>  2.1.3.18185.0-3
- build with final upstream
- Fix rh #566537



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:26:03 -0000	1.3
+++ .cvsignore	2 Mar 2010 08:17:03 -0000	1.4
@@ -1 +1 @@
-Firebird-2.1.3.18185-0.RC2.tar.bz2
+Firebird-2.1.3.18185-0.tar.bz2

firebird-fix-initscript.patch:
 firebird.init.d.mandrake.in |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Index: firebird-fix-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/firebird-fix-initscript.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- firebird-fix-initscript.patch	30 Jul 2009 12:26:03 -0000	1.3
+++ firebird-fix-initscript.patch	2 Mar 2010 08:17:04 -0000	1.4
@@ -22,6 +22,24 @@
  
  # Source function library - RedHat or Mandriva specific
  # functions actually used: checkpid killproc daemon
-
-
+@@ -38,7 +47,7 @@
+ case "$1" in
+   start)
+ 	echo -n "Starting $FULLNAME "
+-	daemon --user=$FBRunUser "export FIREBIRD LD_LIBRARY_PATH; $MANAGER -pidfile $pidfile -start -forever"
++	daemon --user=$FBRunUser export FIREBIRD LD_LIBRARY_PATH; $MANAGER -pidfile $pidfile -start -forever
+ 	RETVAL=$?
+ 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name
+ 	echo
+@@ -47,8 +56,9 @@
+ 	if [ -f $pidfile ]
+ 	then
+ 		echo -n "Stopping $FULLNAME: "
+-		killproc -p $pidfile $name
++		kill $(cat $pidfile)
+ 		RETVAL=$?
++                [ $RETVAL -eq 0 ] && success
+ 		echo
+ 	else
+ 		echo -n "$FULLNAME is stopped"
 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/firebird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- firebird.spec	5 Aug 2009 15:16:33 -0000	1.6
+++ firebird.spec	2 Mar 2010 08:17:04 -0000	1.7
@@ -6,15 +6,14 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
 URL:		http://www.firebirdsql.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
-#Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
-Source0:	http://firebirdsql.org/downloads/prerelease/source/%{pkgname}.RC2.tar.bz2
+Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
 Source1:	firebird-logrotate
 Source2:	README.Fedora
 
@@ -306,7 +305,6 @@ ln	-s	%{_sysconfdir}/%{name}/fbintl.conf
 
 sed	"s@= root@= %{name}@"	%{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd	>	%{buildroot}%{_sysconfdir}/xinetd.d/%{name}
 cp	%{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake	%{buildroot}%{_initrddir}/%{name}
-#sed	"s at chkconfig: 345 at chkconfig: -@"	-i	%{buildroot}%{_initrddir}/%{name}	
 
 sed	"s@%%{fbroot}@%{fbroot}@g"	%{SOURCE2}	>	%{_builddir}/%{pkgname}/doc/README.Fedora
 ln	-s	%{_var}/run/%{name}	.%{fbroot}/run
@@ -522,6 +520,10 @@ fi
 
 
 %changelog
+* Mon Mar 01 2010 Philippe Makowski <makowski at fedoraproject.org>  2.1.3.18185.0-3
+- build with final upstream
+- Fix rh #566537
+
 * Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
 - rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
 - remove stupid rm -rf in postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:26:03 -0000	1.3
+++ sources	2 Mar 2010 08:17:04 -0000	1.4
@@ -1 +1 @@
-a419db70057767b7d6b955436e6e7089  Firebird-2.1.3.18185-0.RC2.tar.bz2
+ec42bd5c85dc2f65baef185228bcc5ca  Firebird-2.1.3.18185-0.tar.bz2