[firebird/f16] - Fix non-fatal POSTIN fix rh #781691 - New upstream

[Philippe Makowski]

commit 0d0aa642bd7ca9286befd61bd318465ec1d16ad3
Author: Philippe Makowski <makowski.firebird-fr.eu.org>
Date:   Thu Jan 19 19:30:06 2012 +0100

    - Fix non-fatal POSTIN fix rh #781691
    - New upstream

 .gitignore    |    1 +
 firebird.spec |   36 ++++++++++++++++++++++--------------
 sources       |    2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e60ca1f..d63e901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 Firebird-2.1.3.18185-0.RC2.tar.bz2
 /Firebird-2.5.0.26074-0.tar.bz2
 /Firebird-2.5.1.26349-0.tar.bz2
+/Firebird-2.5.1.26351-0.tar.bz2
diff --git a/firebird.spec b/firebird.spec
index 8343384..60e6e21 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,12 +1,12 @@
-%global pkgname Firebird-2.5.1.26349-0
+%global pkgname Firebird-2.5.1.26351-0
 %global fbroot %{_libdir}/%{name}
 %global major 2.5.1
 
 
 Summary: SQL relational database management system
 Name:  firebird
-Version: 2.5.1.26349.O
-Release: 3%{?dist}
+Version: 2.5.1.26351.0
+Release: 1%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
@@ -26,7 +26,7 @@ Source7: firebird-superserver.service
 #Patch0: firebird-2.5.0.26074-s390x.patch
 
 # from upstream
-Patch0:		firebird-2.5.1-svn-CORE-3610.patch
+Patch0: firebird-2.5.1-svn-CORE-3610.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -180,7 +180,6 @@ export LDFLAGS='-m32'
 %endif
 
 NOCONFIGURE=1 ./autogen.sh
-#%configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
 %configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
  --with-fbbin=%{fbroot}/bin-classic --with-fbinclude=%{_includedir}/%{name} \
  --with-fbsbin=%{_sbindir} --with-fbconf=%{_sysconfdir}/%{name} --with-fblib=%{_libdir} \
@@ -290,13 +289,13 @@ cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl %{buildroot}%{f
 cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl.conf %{buildroot}%{_sysconfdir}/%{name}/fbintl.conf
 ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf
 
-cd	%{buildroot}%{_libdir}
-ln	-s	libfbclient.so	libgds.so
-ln	-s	libfbclient.so.%{major}	libgds.so.0
-cd	%{buildroot}
+cd %{buildroot}%{_libdir}
+ln -s libfbclient.so libgds.so
+ln -s libfbclient.so.%{major} libgds.so.0
+cd %{buildroot}
 
 echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log
-sed	"s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g"	%{SOURCE1}	>	%{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 install -p -m 644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-classic\@.service
 install -p -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-classic.socket
@@ -304,9 +303,9 @@ install -p -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-classic.socke
 install -p -m 644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{name}-superclassic.service
 install -p -m 644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}/%{name}-superserver.service
 
-sed	"s@%%{fbroot}@%{fbroot}@g"	%{SOURCE2}	>	%{_builddir}/%{pkgname}/doc/README.Fedora
+sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{_builddir}/%{pkgname}/doc/README.Fedora
 
-cd	%{buildroot}
+cd %{buildroot}
 ln -s %{fbroot}/bin/fbsvcmgr .%{_bindir}/fbsvcmgr
 ln -s %{fbroot}/bin/fbtracemgr .%{_bindir}/fbtracemgr
 ln -s %{fbroot}/bin/gbak .%{_bindir}/gbak
@@ -437,8 +436,9 @@ if [ -z "$oldLine" ]; then
 fi
 
 
-%post -p /sbin/ldconfig
-/bin/systemd-tmpfiles %{_sysconfdir}/tmpfiles.d/firebird.conf
+%post 
+/sbin/ldconfig
+/bin/systemd-tmpfiles --create  %{_sysconfdir}/tmpfiles.d/firebird.conf
 
 %postun 
 /sbin/ldconfig
@@ -479,6 +479,7 @@ fi
 %ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
 %ghost %attr(0644,%{name},%{name}) %{_var}/run/%{name}/fb_guard
 %dir %{_sysconfdir}/tmpfiles.d  
+%defattr(0644,root,root)
 %{_sysconfdir}/tmpfiles.d/firebird.conf  
 
 %files doc
@@ -557,6 +558,13 @@ fi
 
 
 %changelog
+* Thu Jan 19 2012 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26351.0-1
+- Fix non-fatal POSTIN fix rh #781691
+- new upstream
+
+* Fri Jan 06 2012 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26349.0-4
+- Rebuild for GCC-4.7
+
 * Mon Nov 28 2011 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26349.O-3
 - Better systemd support fix rh #757624
 
diff --git a/sources b/sources
index 894c7e6..ac32939 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-540713df9b0160699ed52138e1194e07  Firebird-2.5.1.26349-0.tar.bz2
+1772fba4f09c8fc84d989282405f90fd  Firebird-2.5.1.26351-0.tar.bz2