[firebird] - sync the s390(x) utilities list with other arches - add libatomic_ops-devel as BR: on non-x86 arch

[Dan Horák]

commit 7ff1577f0e76a9332f24f45efbe4e5c8daadb147
Author: Dan Horák <dan at danny.cz>
Date:   Thu Dec 16 15:29:33 2010 +0100

    - sync the s390(x) utilities list with other arches
    - add libatomic_ops-devel as BR: on non-x86 arches

 firebird-2.5.0.26074-s390x.patch |   13 +++++++++++++
 firebird.spec                    |   13 ++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/firebird-2.5.0.26074-s390x.patch b/firebird-2.5.0.26074-s390x.patch
new file mode 100644
index 0000000..8d7284c
--- /dev/null
+++ b/firebird-2.5.0.26074-s390x.patch
@@ -0,0 +1,13 @@
+diff -up Firebird-2.5.0.26074-0/builds/posix/prefix.linux_s390x.orig Firebird-2.5.0.26074-0/builds/posix/prefix.linux_s390x
+--- Firebird-2.5.0.26074-0/builds/posix/prefix.linux_s390x.orig	2010-12-16 08:21:10.642757895 -0500
++++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_s390x	2010-12-16 08:21:44.822758177 -0500
+@@ -28,7 +28,7 @@ DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLA
+ 
+ OS_ServerFiles=inet_server.cpp
+ 
+-EMBED_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print fbsvcmgr
+-CLIENT_UTIL_TARGETS=gds_drop gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr
++EMBED_UTIL_TARGETS=gstat gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
++CLIENT_UTIL_TARGETS=gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr fbtracemgr
+ 
+ Physical_IO_Module=os/posix/unix.cpp
diff --git a/firebird.spec b/firebird.spec
index 1fdcaa3..f963c33 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -6,7 +6,7 @@
 Summary: SQL relational database management system
 Name:  firebird
 Version: 2.5.0.26074.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
@@ -18,6 +18,9 @@ Source1: firebird-logrotate
 Source2: README.Fedora
 Source3: firebird.conf
 
+# sync the utilities list with other arches (will be sent upstream)
+Patch0: firebird-2.5.0.26074-s390x.patch
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -30,6 +33,9 @@ BuildRequires: gcc-c++
 %if 0%{?fedora}>=14
 BuildRequires: libstdc++-static
 %endif
+%ifnarch %{ix86} x86_64
+BuildRequires: libatomic_ops-devel
+%endif
 
 Requires: %{name}-arch = %{version}-%{release}
 Requires: grep
@@ -139,6 +145,7 @@ Multi-process, local client libraries for Firebird SQL RDBMS
 
 %prep
 %setup -q -n %{pkgname}
+%patch0 -p1 -b .s390x
 # convert intl character to UTF-8
 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl     -o ./doc/README.intl
 
@@ -515,6 +522,10 @@ fi
 
 
 %changelog
+* Thu Dec 16 2010 Dan Horák <dan[at]danny.cz>  2.5.0.26074.0-2
+- sync the s390(x) utilities list with other arches
+- add libatomic_ops-devel as BR: on non-x86 arches
+
 * Sat Dec 04 2010 Philippe Makowski <makowski at fedoraproject.org>  2.5.0.26074.0-1
 - Fix rh #656587 /var/run mounted as tempfs