- libedit-devel has already BR: ncurses-devel

[packages/Firebird.git] / Firebird.spec

diff --git a/Firebird.spec b/Firebird.spec
index d99356f4309c2410e7533ecf3a370f2ed45b9a06..7b2bc3b3e6979d00d7b027bf14626fce008ea34b 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -13,14 +13,14 @@ Summary(de.UTF-8):  Firebird - relationalen Open-Source- Datenbankmanagementsyste
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version:       2.1.1.17910
-Release:       2
+Version:       2.1.2.18118
+Release:       1
 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
 Source0:       http://dl.sourceforge.net/firebird/Firebird-%{version}-0.tar.bz2
-# Source0-md5: c8bed24245440cb21b9c4fe16aae70bb
+# Source0-md5: 063b3825a06d328f726b733fd74614b1
 Source1:       http://www.firebirdsql.org/pdfmanual/Firebird-2.1-QuickStart.pdf
-# Source1-md5: 676e5b294a04e3cd12b9298a776e19eb
+# Source1-md5: 46bb1af4b94e8c8acee1d6ef2055b2d3
 # distfiles refuses this, would require some audit to allow '('/')' chars
 #Source2:      http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
 ## Source2-md5:        9eb90583c200bdd7292a80ecc1df1178
@@ -46,6 +46,7 @@ Patch1:               %{name}-editline.patch
 Patch2:                %{name}-va.patch
 Patch3:                %{name}-morearchs.patch
 Patch4:                %{name}-FHS.patch
+Patch5:                %{name}-64bit.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
@@ -54,9 +55,9 @@ BuildRequires:        libedit-devel
 BuildRequires: libicu-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
-BuildRequires: ncurses-devel
 BuildRequires: psmisc >= 22.5-2
 BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      %{name}-dirs = %{version}-%{release}
 Requires:      %{name}-lib = %{version}-%{release}
 %if %{with ss}
 Requires(post,preun):  /sbin/chkconfig
@@ -94,6 +95,17 @@ Bugfix-Version mit nur wenigen Erweiterungen angesehen werden kann.
 Eine Erweiterung von Firebird 1.0 ist der 64-Bit File I/O, so dass
 auch Datenbankdateien über 2GB erzeugt werden können.
 
+%package dirs
+Summary:       Firebird SQL Database common directories
+Summary(pl.UTF-8):     Firebird - wspólne katalogi
+Group:         Applications/Databases
+
+%description dirs
+Firebird SQL Database common directories.
+
+%description dirs -l pl.UTF-8
+Firebird - wspólne katalogi.
+
 %package lib
 Summary:       Firebird shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona Firebird
@@ -109,6 +121,7 @@ Biblioteka współdzielona Firebird (libgds).
 Summary:       Header files for Firebird library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Firebird
 Group:         Development/Libraries
+Requires:      %{name}-dirs = %{version}-%{release}
 Requires:      %{name}-lib = %{version}-%{release}
 Requires:      libstdc++-devel
 
@@ -148,6 +161,7 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # force rebuild
 rm -f src/dsql/parse.cpp
@@ -257,13 +271,13 @@ fi
 
 %triggerpostun -- %{name} < 2.1.1.17910-2
 if [ -f %{ibdir}/aliases.conf.rpmsave ]; then
-  mv -f %{ibdir}/aliases.conf.rpmsave %{_sysconfdir}/firebird/aliases.conf
+       mv -f %{ibdir}/aliases.conf.rpmsave %{_sysconfdir}/firebird/aliases.conf
 fi
 if [ -f %{ibdir}/firebird.conf.rpmsave ]; then
-  mv -f %{ibdir}/firebird.conf.rpmsave %{_sysconfdir}/firebird/firebird.conf
+       mv -f %{ibdir}/firebird.conf.rpmsave %{_sysconfdir}/firebird/firebird.conf
 fi
 if [ -f %{ibdir}/security2.fdb.rpmsave ]; then
-  mv -f %{ibdir}/security2.fdb.rpmsave /var/lib/firebird/security2.fdb
+       mv -f %{ibdir}/security2.fdb.rpmsave /var/lib/firebird/security2.fdb
 fi
 
 %files
@@ -272,9 +286,8 @@ fi
 %dir %{_sysconfdir}/firebird
 %attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/*.conf
 %attr(755,root,root) %{_libdir}/libib_util.so
-%dir %{ibdir}
 %attr(755,root,root) %{ibdir}/UDF
-%attr(755,root,root) %{ibdir}/bin
+%attr(755,root,root) %{ibdir}/bin/*
 %exclude %{ibdir}/bin/fb_config
 %{ibdir}/help
 %dir %attr(770,root,firebird) %{ibdir}/intl
@@ -293,6 +306,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/firebird
 %endif
 
+%files dirs
+%defattr(644,root,root,755)
+%dir %{ibdir}
+%dir %{ibdir}/bin
+
 %files lib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*