rpms/firebird/devel README.Fedora,1.2,1.3 firebird.spec,1.6,1.7

[Philippe Makowski]

Author: makowski

Update of /cvs/pkgs/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28242

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* 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: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	11 Jul 2009 16:02:06 -0000	1.2
+++ README.Fedora	5 Aug 2009 13:55:18 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- firebird.spec	30 Jul 2009 13:24:01 -0000	1.6
+++ firebird.spec	5 Aug 2009 13:55:18 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* 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
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463