rpms/xbase
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 3.1.2

Browse source
This commit is contained in:
Tom Callaway 2009-08-20 03:46:20 +00:00
commit b2e1f7d402
6 changed files with 81 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cvsignore
View file

@ -1 +1 @@
xbase-2.0.0.tar.gz
xbase64-3.1.2.tar.gz

2
sources
View file

@ -1 +1 @@
9b29362031716a12491beb9f8cc882f2 xbase-2.0.0.tar.gz
7f3a727c142b4339faa781e1f6d5871c xbase64-3.1.2.tar.gz

12
xbase-3.1.2-fixconfig.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in
--- xbase64-3.1.2/xbase64-config.in.BAD 2009-08-19 22:58:42.081087534 -0400
+++ xbase64-3.1.2/xbase64-config.in 2009-08-19 22:58:45.604090002 -0400
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
exec_prefix_set=no
CC="@CC@"
CXX="@CXX@"
-LD="@SHARED_LD@"
+LD="@LD@"
usage="\
Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"

24
xbase-3.1.2-gcc44.patch Normal file
View file

@ -0,0 +1,24 @@
diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp
--- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 2006-07-17 12:54:42.000000000 -0400
+++ xbase64-3.1.2/xbase64/xbase64.cpp 2009-08-19 23:08:14.724079392 -0400
@@ -66,6 +66,8 @@
#include <dos.h>
#endif
+#include <cerrno>
+
/*! \file xbase64.cpp
*/
diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp
--- xbase64-3.1.2/xbase64/xblock.cpp.gcc44 2009-08-19 23:08:59.408186578 -0400
+++ xbase64-3.1.2/xbase64/xblock.cpp 2009-08-19 23:09:11.416184844 -0400
@@ -65,6 +65,8 @@
//#include <stdio.h>
//#include <stdlib.h>
+#include <cerrno>
+
/*! \file xblock.cpp
*/
#ifdef XB_LOCKING_ON

9
xbase-3.1.2-xbnode.patch Normal file
View file

@ -0,0 +1,9 @@
diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp
--- xbase64-3.1.2/xbase64/xbnode.cpp.BAD 2009-08-19 23:10:38.444059289 -0400
+++ xbase64-3.1.2/xbase64/xbnode.cpp 2009-08-19 23:10:47.348202984 -0400
@@ -1,4 +1,4 @@
-#include "xbNode.h"
+#include "xbnode.h"
void xbNodeLink::AddNode(xbNodeLink* node)
{

51
xbase.spec
View file

@ -1,18 +1,18 @@
Name: xbase
Summary: XBase compatible database library
Version: 2.0.0
Release: 15%{?dist}
Version: 3.1.2
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://linux.techass.com/projects/xdb/
Source0: http://downloads.sourceforge.net/xdb/%{name}-%{version}.tar.gz
Patch0: xbase-2.0.0-fixconfig.patch
Patch1: xbase-2.0.0-fixheader.patch
Source0: http://downloads.sourceforge.net/xdb/%{name}64-%{version}.tar.gz
Patch0: xbase-3.1.2-fixconfig.patch
Patch1: xbase-3.1.2-gcc44.patch
Patch2: xbase-2.0.0-ppc.patch
Patch3: xbase-2.0.0-gcc43.patch
Patch4: xbase-2.0.0-x86_64.patch
Patch3: xbase-3.1.2-xbnode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
BuildRequires: doxygen, libtool
Provides: xbase64 = %{version}-%{release}
%description
XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
@ -28,6 +28,7 @@ OS's.
Summary: XBase development libraries and headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: xbase64-devel = %{version}-%{release}
%description devel
Headers and libraries for compiling programs that use the XBase library.
@ -36,6 +37,7 @@ Headers and libraries for compiling programs that use the XBase library.
Summary: XBase utilities / tools
Group: Applications/Databases
License: GPLv2+
Provides: xbase64-utils = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description utils
@ -47,14 +49,16 @@ reindex (rebuild an index), undelall (undeletes all deleted records in a file),
zap (remove all records from a DBF file).
%prep
%setup -q
%setup -q -n %{name}64-%{version}
%patch0 -p1
%patch1 -p1
%patch1 -p1 -b .gcc44
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
touch AUTHORS README NEWS
cp -p copying COPYING
autoreconf -i
%configure --disable-static
make %{?_smp_mflags}
@ -64,8 +68,18 @@ make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
# Fix files for multilib
touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/xbase-config
touch -r NEWS docs/html/*.html
touch -r COPYING $RPM_BUILD_ROOT%{_bindir}/xbase-config
touch -r COPYING docs/html/*.html
pushd $RPM_BUILD_ROOT%{_libdir}
ln -s libxbase64.so.1.0.0 libxbase.so.1.0.0
ln -s libxbase64.so.1 libxbase.so.1
ln -s libxbase64.so libxbase.so
popd
pushd $RPM_BUILD_ROOT%{_includedir}
ln -s xbase64 xbase
popd
%clean
rm -rf $RPM_BUILD_ROOT
@ -76,15 +90,15 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root, 0755)
%doc NEWS README TODO AUTHORS COPYING ChangeLog
%doc COPYING ChangeLog
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root, 0755)
%doc docs/html
%{_includedir}/xbase
%{_bindir}/xbase-config
%{_libdir}/libxbase.so
%{_includedir}/xbase*
%{_bindir}/xbase*-config
%{_libdir}/libxbase*.so
%files utils
%defattr(-, root, root, 0755)
@ -101,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dbfutil1
%changelog
* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.1.2-1
- update to 3.1.2
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild