commit xbsql for openSUSE:Factory
Hello community, here is the log from the commit of package xbsql for openSUSE:Factory checked in at 2017-09-04 12:36:06 Comparing /work/SRC/openSUSE:Factory/xbsql (Old) and /work/SRC/openSUSE:Factory/.xbsql.new (New) Package is "xbsql" Mon Sep 4 12:36:06 2017 rev:22 rq:520352 version:0.11 Changes: --- /work/SRC/openSUSE:Factory/xbsql/xbsql.changes 2015-04-23 08:04:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.xbsql.new/xbsql.changes 2017-09-04 12:36:09.816853180 +0200 @@ -1,0 +2,6 @@ +Sat Sep 2 11:41:18 UTC 2017 - wba...@tmo.at + +- Add xbase64.patch to fix build with latest xbase(64) 3.1.2 in + Factory + +--- New: xbase64.patch Other differences: -- ++ xbsql.spec ++ --- /var/tmp/diff_new_pack.bjFhTk/_old 2017-09-04 12:36:10.704728264 +0200 +++ /var/tmp/diff_new_pack.bjFhTk/_new 2017-09-04 12:36:10.704728264 +0200 @@ -27,6 +27,8 @@ Source0:%{name}-%{version}.tar.bz2 Patch0: %{name}.diff Patch1: xbsql-0.11-bufferoverflowstrncat.patch +# PATCH-FIX-OPENSUSE xbase64.patch -- fix build with latest xbase(64) 3.1.2 in Factory +Patch2: xbase64.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -70,6 +72,7 @@ %setup -q %patch0 %patch1 +%patch2 -p1 %build autoreconf -fi ++ xbase64.patch ++ diff -ur xbsql-0.11.orig/test/Makefile.am xbsql-0.11/test/Makefile.am --- xbsql-0.11.orig/test/Makefile.am2017-08-30 12:48:09.0 +0200 +++ xbsql-0.11/test/Makefile.am 2017-08-30 12:47:12.0 +0200 @@ -6,5 +6,5 @@ S003_multi_SOURCES = S003_multi.cpp -S003_multi_LDFLAGS = -lxbase $(DEBUG) ../xbsql/libxbsql.la +S003_multi_LDFLAGS = -lxbase64 $(DEBUG) ../xbsql/libxbsql.la diff -ur xbsql-0.11.orig/xbsql/Makefile.am xbsql-0.11/xbsql/Makefile.am --- xbsql-0.11.orig/xbsql/Makefile.am 2017-08-30 12:48:09.0 +0200 +++ xbsql-0.11/xbsql/Makefile.am2017-08-30 12:47:34.0 +0200 @@ -16,10 +16,10 @@ xb_assignlist.cpp xb_create.cpp \ xbsql.tab.c xb_datetime.cpp -libxbsql_la_LDFLAGS= -lxbase +libxbsql_la_LDFLAGS= -lxbase64 xql_SOURCES= xql.cpp -xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la +xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la # # diff -ur xbsql-0.11.orig/xbsql/xbsql.cpp xbsql-0.11/xbsql/xbsql.cpp --- xbsql-0.11.orig/xbsql/xbsql.cpp 2017-08-30 12:48:09.0 +0200 +++ xbsql-0.11/xbsql/xbsql.cpp 2017-08-30 12:47:12.0 +0200 @@ -207,7 +207,7 @@ break ; default : - e = xbStrError (rc) ; + e = GetErrorMessage (rc) ; break ; } @@ -230,7 +230,7 @@ chart[1024] ; va_list aptr; - strcpy(t, xbStrError (rc)) ; + strcpy(t, GetErrorMessage (rc)) ; strcat(t, ": ") ; int l = strlen(t) ; diff -ur xbsql-0.11.orig/xbsql/xbsql.h xbsql-0.11/xbsql/xbsql.h --- xbsql-0.11.orig/xbsql/xbsql.h 2003-03-28 20:07:31.0 +0100 +++ xbsql-0.11/xbsql/xbsql.h2017-08-30 12:47:12.0 +0200 @@ -43,8 +43,7 @@ #endif -#include -#include +#include class XBaseSQL; class XBSQLTable ;
commit xbsql for openSUSE:Factory
Hello community, here is the log from the commit of package xbsql for openSUSE:Factory checked in at 2015-04-23 08:04:12 Comparing /work/SRC/openSUSE:Factory/xbsql (Old) and /work/SRC/openSUSE:Factory/.xbsql.new (New) Package is "xbsql" Changes: --- /work/SRC/openSUSE:Factory/xbsql/xbsql.changes 2011-11-22 17:50:05.0 +0100 +++ /work/SRC/openSUSE:Factory/.xbsql.new/xbsql.changes 2015-04-23 08:04:13.0 +0200 @@ -1,0 +2,6 @@ +Tue Apr 21 16:36:16 UTC 2015 - mplus...@suse.com + +- Cleanup with spec-cleaner +- Split devel and libraries packages + +--- Other differences: -- ++ xbsql.spec ++ --- /var/tmp/diff_new_pack.gf1bCJ/_old 2015-04-23 08:04:13.0 +0200 +++ /var/tmp/diff_new_pack.gf1bCJ/_new 2015-04-23 08:04:13.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package xbsql # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define lib_name lib%{name}0 Name: xbsql -BuildRequires: bison flex gcc-c++ libtool ncurses-devel readline-devel xbase-devel +Version:0.11 +Release:0 +Summary:SQL Wrapper for the XBase Library License:LGPL-2.1+ Group: Development/Libraries/C and C++ -Summary:SQL Wrapper for the XBase Library Url:http://www.quaking.demon.co.uk/xbsql.html -Version:0.11 -Release:235 -Source0:%name-%version.tar.bz2 -Patch0: %name.diff +Source0:%{name}-%{version}.tar.bz2 +Patch0: %{name}.diff Patch1: xbsql-0.11-bufferoverflowstrncat.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: readline-devel +BuildRequires: xbase-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,11 +43,28 @@ files and indexes (.dbf and related files, for example). It provides record level access to these files. +%package -n %{lib_name} +Summary:Shared libraries for %{name} +Group: Development/Libraries/C and C++ +%description -n %{lib_name} +XBase DBMS is a C++ library that supports access to XBase type data +files and indexes (.dbf and related files, for example). It provides +record level access to these files. -Authors: - -Mike Richardson +This package contains shared libraries + +%package devel +Summary:Files for developing with %{name} +Group: Development/Libraries/C and C++ +Requires: %{lib_name} = %{version} + +%description devel +XBase DBMS is a C++ library that supports access to XBase type data +files and indexes (.dbf and related files, for example). It provides +record level access to these files. + +This package contains development files %prep %setup -q @@ -48,15 +72,17 @@ %patch1 %build -autoreconf -ifv -%configure --disable-static --with-pic +autoreconf -fi +%configure \ + --disable-static \ + --with-pic rm xbsql/lex.yy.c -%{__make} %{?jobs:-j%jobs} -C xbsql lex.yy.c -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} -C xbsql lex.yy.c +make %{?_smp_mflags} %check cd test -make +make %{?_smp_mflags} ./runtests %install @@ -64,21 +90,25 @@ # # solve file conflict with perl-XML-XQL # -mv $RPM_BUILD_ROOT/usr/bin/xql $RPM_BUILD_ROOT/usr/bin/XQL -%{__rm} -f %{buildroot}%{_libdir}/*.la +mv %{buildroot}%{_bindir}/xql %{buildroot}%{_bindir}/XQL +find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig +%post -n %{lib_name} -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%clean -rm -rf ${RPM_BUILD_ROOT} +%postun -n %{lib_name} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS TODO COPYING README NEWS doc -/usr/bin/* -/usr/include/* -%_libdir/libxbsql* +%doc AUTHORS TODO COPYING README doc +%{_bindir}/* + +%files -n %{lib_name} +%defattr(-,root,root) +%{_libdir}/libxbsql.so.* + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/libxbsql.so %changelog
commit xbsql for openSUSE:Factory
Hello community, here is the log from the commit of package xbsql for openSUSE:Factory checked in at 2011-12-06 19:13:55 Comparing /work/SRC/openSUSE:Factory/xbsql (Old) and /work/SRC/openSUSE:Factory/.xbsql.new (New) Package is "xbsql", Maintainer is "nadvor...@suse.com" Changes: Other differences: -- ++ xbsql.spec ++ --- /var/tmp/diff_new_pack.7mGbpE/_old 2011-12-06 19:53:38.0 +0100 +++ /var/tmp/diff_new_pack.7mGbpE/_new 2011-12-06 19:53:38.0 +0100 @@ -20,7 +20,7 @@ Name: xbsql BuildRequires: bison flex gcc-c++ libtool ncurses-devel readline-devel xbase-devel -License:LGPL v2.1 or later +License:LGPL-2.1+ Group: Development/Libraries/C and C++ Summary:SQL Wrapper for the XBase Library Url:http://www.quaking.demon.co.uk/xbsql.html -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xbsql for openSUSE:Factory
Hello community, here is the log from the commit of package xbsql for openSUSE:Factory checked in at 2011-11-22 17:50:03 Comparing /work/SRC/openSUSE:Factory/xbsql (Old) and /work/SRC/openSUSE:Factory/.xbsql.new (New) Package is "xbsql", Maintainer is "nadvor...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/xbsql/xbsql.changes 2011-09-23 12:51:01.0 +0200 +++ /work/SRC/openSUSE:Factory/.xbsql.new/xbsql.changes 2011-11-22 17:50:05.0 +0100 @@ -1,0 +2,5 @@ +Sat Nov 19 16:05:28 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ xbsql.spec ++ --- /var/tmp/diff_new_pack.2XqU8E/_old 2011-11-22 17:50:06.0 +0100 +++ /var/tmp/diff_new_pack.2XqU8E/_new 2011-11-22 17:50:06.0 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xbsql (Version 0.11) +# spec file for package xbsql # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: xbsql -BuildRequires: bison flex gcc-c++ ncurses-devel readline-devel xbase-devel +BuildRequires: bison flex gcc-c++ libtool ncurses-devel readline-devel xbase-devel License:LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary:SQL Wrapper for the XBase Library -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org