- rpm version for noarch subpackages

[packages/libgda3.git] / libgda3.spec

diff --git a/libgda3.spec b/libgda3.spec
index 3b03970c1c65d2922f10d9b294075324719f6f34..c94d83d66fe345aa433cda9ddf6143bee85d35ab 100644 (file)
--- a/libgda3.spec
+++ b/libgda3.spec
@@ -18,7 +18,7 @@
 %bcond_without sqlite          # SQLite plugin
 %bcond_without sybase          # sybase plugin
 %bcond_without xbase           # xbase plugin
-#
+
 %if %{without gnome}
 %undefine      with_gnomevfs
 %endif
@@ -29,7 +29,7 @@ Summary:      GNU Data Access library
 Summary(pl.UTF-8):     Biblioteka GNU Data Access
 Name:          libgda3
 Version:       3.1.5
-Release:       18
+Release:       21
 License:       LGPL v2+/GPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgda/3.1/libgda-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Patch1:               %{name}-am.patch
 Patch2:                glib232.patch
 Patch3:                format-security.patch
 Patch4:                mdb-0.7.patch
+Patch5:                x32.patch
 URL:           http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.59
@@ -51,7 +52,7 @@ BuildRequires:        flex
 %{?with_freetds:BuildRequires: freetds-devel = 0.64}
 %{?with_sybase:BuildRequires:  freetds-devel >= 0.82}
 %{?with_gamin:BuildRequires:   gamin-devel >= 0.1.8}
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.12.0
 BuildRequires: gnome-common >= 2.12.0
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.20}
@@ -70,6 +71,7 @@ BuildRequires:        pkgconfig
 BuildRequires: popt-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel >= 5.0
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.213
 %{?with_sqlite:BuildRequires:  sqlite3-devel >= 3.5.0-2}
 %{?with_odbc:BuildRequires:    unixODBC-devel}
@@ -141,6 +143,7 @@ Summary:    GNU Data Access API documentation
 Summary(pl.UTF-8):     Dokumentacja API GNU Data Access
 Group:         Documentation
 Requires:      gtk-doc-common
+BuildArch:     noarch
 
 %description apidocs
 GNU Data Access API documentation.
@@ -302,6 +305,7 @@ Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro) dla GDA.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if %{without gamin}
 %{__sed} -i -e 's#PKG_CHECK_MODULES(GAMIN.*)#have_fam=no#g' configure.in
@@ -347,7 +351,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{__rm} $RPM_BUILD_ROOT{%{providersdir},%{_libdir}}/*.la
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sr@Latn,sr@latin}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@Latn,sr@latin}
 
 %find_lang libgda-3.0