changeset
Remove versioned patch logic, and correct 64-bit building.
Fri, 16 Jan 2009 20:56:21 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 16 Jan 2009 20:56:21 +0100
- changeset 98
- b48a2cd3a7b1
- parent 97
- da688f850c6d
- child 99
- 161326b4f1f9
Remove versioned patch logic, and correct 64-bit building.
| xbase/xbase.patch | file | annotate | diff | comparison | revisions | |
| xbase/xbase.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/xbase/xbase.patch Fri Jan 16 20:54:43 2009 +0100 1.2 +++ b/xbase/xbase.patch Fri Jan 16 20:56:21 2009 +0100 1.3 @@ -1,6 +1,6 @@ 1.4 -Index: xbase-2.0.0/tv/tvbrowse.cpp 1.5 ---- xbase-2.0.0/tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200 1.6 -+++ xbase-2.0.0/tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100 1.7 +Index: tv/tvbrowse.cpp 1.8 +--- tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200 1.9 ++++ tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100 1.10 @@ -28,8 +28,8 @@ 1.11 #include <stdlib.h> 1.12 #include <stdio.h> 1.13 @@ -12,9 +12,9 @@ 1.14 1.15 #define Uses_TEvent 1.16 #include <tvision/tv.h> 1.17 -Index: xbase-2.0.0/tv/tvxbase.cpp 1.18 ---- xbase-2.0.0/tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200 1.19 -+++ xbase-2.0.0/tv/tvxbase.cpp 2006-01-15 00:23:04 +0100 1.20 +Index: tv/tvxbase.cpp 1.21 +--- tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200 1.22 ++++ tv/tvxbase.cpp 2006-01-15 00:23:04 +0100 1.23 @@ -23,7 +23,7 @@ 1.24 Foundation, Inc., or see http://www.gnu.org/. 1.25 */ 1.26 @@ -24,9 +24,9 @@ 1.27 1.28 #define Uses_TApplication 1.29 #define Uses_TButton 1.30 -Index: xbase-2.0.0/xbase/dbf.h 1.31 ---- xbase-2.0.0/xbase/dbf.h.orig 2001-01-13 21:20:53 +0100 1.32 -+++ xbase-2.0.0/xbase/dbf.h 2006-01-15 00:23:04 +0100 1.33 +Index: xbase/dbf.h 1.34 +--- xbase/dbf.h.orig 2001-01-13 21:20:53 +0100 1.35 ++++ xbase/dbf.h 2006-01-15 00:23:04 +0100 1.36 @@ -65,7 +65,7 @@ 1.37 #include <xbase/xtypes.h> 1.38 #include <xbase/xdate.h> 1.39 @@ -36,9 +36,9 @@ 1.40 #include <stdio.h> 1.41 1.42 /*! \file dbf.h 1.43 -Index: xbase-2.0.0/xbase/ndx.cpp 1.44 ---- xbase-2.0.0/xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100 1.45 -+++ xbase-2.0.0/xbase/ndx.cpp 2006-01-15 00:23:04 +0100 1.46 +Index: xbase/ndx.cpp 1.47 +--- xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100 1.48 ++++ xbase/ndx.cpp 2006-01-15 00:23:04 +0100 1.49 @@ -66,7 +66,8 @@ 1.50 #endif 1.51 1.52 @@ -49,9 +49,9 @@ 1.53 1.54 #ifdef XB_INDEX_NDX 1.55 1.56 -Index: xbase-2.0.0/xbase/stack.cpp 1.57 ---- xbase-2.0.0/xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100 1.58 -+++ xbase-2.0.0/xbase/stack.cpp 2006-01-15 00:23:04 +0100 1.59 +Index: xbase/stack.cpp 1.60 +--- xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100 1.61 ++++ xbase/stack.cpp 2006-01-15 00:23:04 +0100 1.62 @@ -59,7 +59,8 @@ 1.63 1.64 #include <string.h> 1.65 @@ -62,9 +62,9 @@ 1.66 1.67 #include <xbase/xstack.h> 1.68 1.69 -Index: xbase-2.0.0/xbase/xbstring.cpp 1.70 ---- xbase-2.0.0/xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100 1.71 -+++ xbase-2.0.0/xbase/xbstring.cpp 2006-01-15 00:23:04 +0100 1.72 +Index: xbase/xbstring.cpp 1.73 +--- xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100 1.74 ++++ xbase/xbstring.cpp 2006-01-15 00:23:04 +0100 1.75 @@ -582,7 +582,7 @@ 1.76 //! Short description. 1.77 /*! 1.78 @@ -74,9 +74,9 @@ 1.79 return os << xbs.data; 1.80 } 1.81 1.82 -Index: xbase-2.0.0/xbase/xbstring.h 1.83 ---- xbase-2.0.0/xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100 1.84 -+++ xbase-2.0.0/xbase/xbstring.h 2006-01-15 00:23:04 +0100 1.85 +Index: xbase/xbstring.h 1.86 +--- xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100 1.87 ++++ xbase/xbstring.h 2006-01-15 00:23:04 +0100 1.88 @@ -56,7 +56,11 @@ 1.89 #endif 1.90 1.91 @@ -99,25 +99,9 @@ 1.92 1.93 xbString &remove(size_t pos = 0, int n = npos); 1.94 xbString mid(size_t pos = 0, int n = npos) const; 1.95 -Index: xbsql-0.11/xbsql/Makefile.in 1.96 ---- xbsql-0.11/xbsql/Makefile.in.orig 2003-03-28 21:03:25 +0100 1.97 -+++ xbsql-0.11/xbsql/Makefile.in 2006-01-15 10:01:51 +0100 1.98 -@@ -108,10 +108,10 @@ 1.99 - xbsql.tab.c xb_datetime.cpp 1.100 - 1.101 - 1.102 --libxbsql_la_LDFLAGS = -lxbase $(DEBUG) 1.103 -+libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG) 1.104 - 1.105 - xql_SOURCES = xql.cpp 1.106 --xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la 1.107 -+xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la 1.108 - 1.109 - 1.110 - #install-data-hook: 1.111 -Index: xbase-2.0.0/ltmain.sh 1.112 ---- xbase-2.0.0/ltmain.sh.orig 2000-06-01 08:03:18 +0200 1.113 -+++ xbase-2.0.0/ltmain.sh 2006-01-15 10:05:44 +0100 1.114 +Index: ltmain.sh 1.115 +--- ltmain.sh.orig 2000-06-01 08:03:18 +0200 1.116 ++++ ltmain.sh 2006-01-15 10:05:44 +0100 1.117 @@ -728,7 +728,7 @@ 1.118 ;; 1.119 esac
2.1 --- a/xbase/xbase.spec Fri Jan 16 20:54:43 2009 +0100 2.2 +++ b/xbase/xbase.spec Fri Jan 16 20:56:21 2009 +0100 2.3 @@ -36,7 +36,7 @@ 2.4 Group: Database 2.5 License: GPL 2.6 Version: %{V_xbase} 2.7 -Release: 20080101 2.8 +Release: 20090106 2.9 2.10 # list of sources 2.11 Source0: http://www.rekallrevealed.org/packages/xbase-%{V_xbase}.tgz 2.12 @@ -75,9 +75,25 @@ 2.13 %prep 2.14 %setup -q -c 2.15 %setup -q -T -D -a 1 2.16 - %patch -p0 2.17 + ( cd xbase-%{V_xbase} 2.18 + %patch -p0 2.19 + ) || exit $? 2.20 + %{l_shtool} subst \ 2.21 + -e "s;/usr\(/lib/libncurses\)\.so;%{l_prefix}/\1.a;" \ 2.22 + xbsql-%{V_xbsql}/configure 2.23 + %{l_shtool} subst \ 2.24 + -e 's;^\(libxbsql_la_LDFLAGS = -lxbase\);\1 @LDFLAGS@;' \ 2.25 + -e 's;^\(xql_LDADD =\) \(-lxbase\);\1 @LDFLAGS@ \2;' \ 2.26 + xbsql-%{V_xbsql}/xbsql/Makefile.in 2.27 2.28 %build 2.29 + platcomp="%{l_platform -t}" 2.30 + case "%{l_platform -t}" in 2.31 + sun4[uv]-sunos* ) platcomp="sparc-solaris" ;; 2.32 + *-sunos* ) platcomp="i386-solaris" ;; 2.33 + *-linux* ) platcomp="i386-linux" ;; 2.34 + *-freebsd* ) platcomp="i386-freebsd" ;; 2.35 + esac 2.36 ( cd xbase-%{V_xbase} 2.37 CC="%{l_cc}" \ 2.38 CXX="%{l_cxx}" \ 2.39 @@ -86,6 +102,7 @@ 2.40 CPPFLAGS="%{l_cppflags}" \ 2.41 LDFLAGS="%{l_ldflags}" \ 2.42 ./configure \ 2.43 + --host=$platcomp \ 2.44 --prefix=%{l_prefix} \ 2.45 --disable-shared 2.46 %{l_make} %{l_mflags -O}
