- updated to 2.0.0 from new URL, removed obsolete autoconf patch

Changed files:
    xbase-autoconf.patch -> 1.2
    xbase.spec -> 1.27

diff --git a/xbase-autoconf.patch b/xbase-autoconf.patch
deleted file mode 100644 (file)
index 00e369d..0000000
--- a/xbase-autoconf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru xbase-1.8.1/aclocal.m4 xbase-1.8.1.new/aclocal.m4
---- xbase-1.8.1/aclocal.m4     Sun Aug  1 23:17:58 1999
-+++ xbase-1.8.1.new/aclocal.m4 Sun Aug  1 23:11:54 1999
-@@ -1039,7 +1039,7 @@
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+[AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-diff -Nru xbase-1.8.1/xbase/Makefile.am xbase-1.8.1.new/xbase/Makefile.am
---- xbase-1.8.1/xbase/Makefile.am      Sun Aug  1 23:18:31 1999
-+++ xbase-1.8.1.new/xbase/Makefile.am  Fri Mar 19 11:56:33 1999
-@@ -25,7 +25,7 @@
-         xbconfig.h
- 
- install-data-hook:
--      (cd $(includedir); rm -f xbase.h; ln -s xbase/xbase.h xbase.h)
-+      (cd $(DESTDIR)$(includedir); rm -f xbase.h; ln -s xbase/xbase.h xbase.h)
- 
- libxbase_la_SOURCES = dbf.cpp exp.cpp expfunc.cpp expproc.cpp fields.cpp \
-       html.cpp lock.cpp memo.cpp ndx.cpp stack.cpp xbase.cpp xdate.cpp \

diff --git a/xbase.spec b/xbase.spec
index e57997b19e75bd12eb332c1db4a4d689da940bc2..9fe86fa1e35f88ece92b860b1ce034de10bbe8b3 100644 (file)
--- a/xbase.spec
+++ b/xbase.spec
@@ -1,17 +1,16 @@
 Summary:       Xbase DBMS Library
 Summary(pl):   Xbase - biblioteka dla ró¿nych baz danych
 Name:          xbase
-Version:       1.8.1
-Release:       9
+Version:       2.0.0
+Release:       1
 License:       LGPL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
-Source0:       ftp://www.startech.keller.tx.us/pub/xbase/%name-%version.tar.gz
-Patch0:                %{name}-autoconf.patch
-URL:           http://www.startech.keller.tx.us/xbase.html
+Source0:       http://prdownloads.sourceforge.net/xdb/%{name}-%{version}.tar.gz
+URL:           http://linux.techass.com/projects/xdb/
 BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,14 +55,11 @@ u
 
 %prep
 %setup -q 
-%patch -p1
 
 %build
-automake -a -c
-autoconf
 CPPFLAGS="%{rpmcflags} -fno-rtti -fno-implicit-templates"
 export CPPFLAGS
-%configure \
+%configure2_13 \
        --enable-nls \
        --with-exceptions \
        --with-index-ndx \
@@ -85,12 +81,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *gz
-%attr(755,root,root) %{_bindir}/*
+%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,*.gif,*.jpg}
+%attr(755,root,root) %{_bindir}/xbase-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
-%{_includedir}/*
+%{_includedir}/xbase