- updated to 2.1.1 (devel, but ready for gcc 3.x); added fix patch

Changed files:
    xbase.spec -> 1.42

diff --git a/xbase.spec b/xbase.spec
index 355adfd11aa60d77476b9a3afd4b7b1f7e45bce3..28514c9b8caa6d6d17dde30526cfc2f59eb03af5 100644 (file)
--- a/xbase.spec
+++ b/xbase.spec
@@ -1,14 +1,18 @@
 Summary:       XBase - xbase-compatible C++ class library
 Summary(pl):   XBase - kompatybilna z xbase biblioteka klas C++
 Name:          xbase
-Version:       2.0.0
+Version:       2.1.1
 Release:       1
-License:       LGPL
+License:       LGPL (library), GPL (programs)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz
-# Source0-md5: 9b29362031716a12491beb9f8cc882f2
+# Source0-md5: f36852f0ba0c4d9e047e84c3269fde37
+Patch0:                %{name}-fix.patch
 URL:           http://linux.techass.com/projects/xdb/
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake
 BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,8 +34,9 @@ plik
 %package devel
 Summary:       XBase development files
 Summary(pl):   Pliki dla programistów u¿ywaj±cych XBase
+License:       LGPL
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 This package contains XBase development files.
@@ -40,13 +45,31 @@ This package contains XBase development files.
 Ten pakiet zawiera pliki nag³ówkowe potrzebne przy tworzeniu
 aplikacji u¿ywaj±cych Xbase.
 
+%package static
+Summary:       Static XBase library
+Summary(pl):   Statyczna biblioteka XBase
+License:       LGPL
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static XBase library.
+
+%description static -l pl
+Statyczna biblioteka XBase.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-CPPFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates"
-export CPPFLAGS
-%configure2_13 \
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
+%configure \
        --enable-nls \
        --with-exceptions \
        --with-index-ndx \
@@ -67,14 +90,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog TODO AUTHORS NEWS README
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/[!x]*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc html/{*.html,*.gif,*.jpg}
+%doc html/{*.html,*.jpg}
 %attr(755,root,root) %{_bindir}/xbase-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/xbase
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a