Hello community, here is the log from the commit of package sqlite2 for openSUSE:Factory checked in at 2017-12-20 10:40:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqlite2 (Old) and /work/SRC/openSUSE:Factory/.sqlite2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sqlite2" Wed Dec 20 10:40:31 2017 rev:27 rq:558586 version:2.8.17 Changes: -------- --- /work/SRC/openSUSE:Factory/sqlite2/sqlite2.changes 2013-12-19 12:37:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sqlite2.new/sqlite2.changes 2017-12-20 10:40:33.531970028 +0100 @@ -1,0 +2,12 @@ +Tue Dec 19 15:24:43 UTC 2017 - mplus...@suse.com + +- Use configure macros +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- +Mon Dec 18 08:29:20 UTC 2017 - sch...@suse.de + +- lemon-undefined.patch: remove undefined behaviour due to signed integer + overflow + +------------------------------------------------------------------- New: ---- lemon-undefined.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite2.spec ++++++ --- /var/tmp/diff_new_pack.mx1QXP/_old 2017-12-20 10:40:34.187922540 +0100 +++ /var/tmp/diff_new_pack.mx1QXP/_new 2017-12-20 10:40:34.191922251 +0100 @@ -1,7 +1,7 @@ # # spec file for package sqlite2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,28 +17,24 @@ Name: sqlite2 -BuildRequires: libtool -BuildRequires: readline-devel -BuildRequires: tcl-devel -BuildRequires: update-desktop-files +Version: 2.8.17 +Release: 0 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain Group: Productivity/Databases/Servers -# bug437293 -%ifarch ppc64 -Obsoletes: sqlite2-64bit -%endif -# Url: http://www.sqlite.org/ -Version: 2.8.17 -Release: 0 -Source0: http://www.sqlite.org/sqlite-%version.tar.bz2 +Source0: http://www.sqlite.org/sqlite-%{version}.tar.bz2 Source1: sqlite2.desktop Source2: baselibs.conf Patch0: sqlite.diff Patch1: sqlite2-tcl.diff Patch2: detect_sqlite3.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch3: lemon-undefined.patch +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: tcl-devel +BuildRequires: update-desktop-files %description SQLite is a C library that implements an embeddable SQL database @@ -52,22 +48,11 @@ SQLite can be used via the sqlite command line tool or via any application that supports the Qt database plug-ins. - - -Authors: --------- - D. Richard Hipp <d...@hwaci.com> - %package devel Summary: Embeddable SQL Database Engine -Group: Productivity/Databases/Servers +Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: sqlite2 = %version -# bug437293 -%ifarch ppc64 -Obsoletes: sqlite2-devel-64bit -%endif -# +Requires: sqlite2 = %{version} %description devel SQLite is a C library that implements an embeddable SQL database @@ -81,20 +66,16 @@ SQLite can be used via the sqlite command line tool or via any application that supports the Qt database plug-ins. - - -Authors: --------- - D. Richard Hipp <d...@hwaci.com> - %prep -%setup -q -n sqlite-%version +%setup -q -n sqlite-%{version} # sqlite.diff %patch0 # sqlite2-tcl.diff %patch1 # detect_sqlite3.patch %patch2 -p1 +# remove undefined behaviour due to signed integer overflow +%patch3 -p1 %ifarch s390 s390x # some (minor ?) miscalculations with float values on these platforms @@ -114,61 +95,44 @@ rm test/tclsqlite.test # does not work due to our ulimits in our build system rm test/bigfile.test -autoreconf -fi %build - export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1 -fno-strict-aliasing -DUSE_INTERP_RESULT" - export CXXFLAGS="$CFLAGS -fno-strict-aliasing" - mkdir build - cd build - ln -s ../VERSION . - ../configure \ - --prefix=/usr \ - --libdir=%_libdir \ - --mandir=%_mandir \ +autoreconf -fiv +export CFLAGS="%{optflags} -DNDEBUG=1 -fno-strict-aliasing -DUSE_INTERP_RESULT" +export CXXFLAGS="$CFLAGS -fno-strict-aliasing" +%configure \ --enable-utf8 \ - --sysconfdir=/etc/ \ --disable-static \ --with-pic - %{__make} %{?_smp_mflags} - make doc +make %{?_smp_mflags} all doc %check - cd build - make fulltest +make %{?_smp_mflags} fulltest %install - cd build - make DESTDIR="$RPM_BUILD_ROOT" install - install -d $RPM_BUILD_ROOT%_mandir/man1/ - install -m 0644 ../sqlite.1 $RPM_BUILD_ROOT%_mandir/man1/ - # - # install the susehelp meta file - mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/ - install -m 0644 %SOURCE1 \ - $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/ - %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/susehelp/meta/Development/Libraries/sqlite2.desktop -%{__rm} -f %{buildroot}%{_libdir}/*.la +%make_install +install -Dpm 0644 sqlite.1 \ + %{buildroot}%{_mandir}/man1/sqlite.1 +# +# install the susehelp meta file +install -Dpm 0644 %{SOURCE1} \ + %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/sqlite2.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/sqlite2.desktop +find %{buildroot} -type f -name "*.la" -delete -print %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root) -/usr/bin/sqlite -%_mandir/man1/* -%_libdir/libsqlite.so.* +%{_bindir}/sqlite +%{_mandir}/man1/* +%{_libdir}/libsqlite.so.* %files devel -%defattr(-,root,root) -%doc build/doc/* -%doc /usr/share/susehelp -/usr/include/sqlite.h -%_libdir/libsqlite.so -%_libdir/pkgconfig/sqlite.pc +%doc doc/* +%doc %{_datadir}/susehelp +%{_includedir}/sqlite.h +%{_libdir}/libsqlite.so +%{_libdir}/pkgconfig/sqlite.pc %changelog ++++++ lemon-undefined.patch ++++++ Index: sqlite-2.8.17/tool/lemon.c =================================================================== --- sqlite-2.8.17.orig/tool/lemon.c +++ sqlite-2.8.17/tool/lemon.c @@ -3016,7 +3016,7 @@ int mhflag; /* True if g int maxdtlength; /* Maximum length of any ".datatype" field. */ char *stddt; /* Standardized name for a datatype */ int i,j; /* Loop counters */ - int hash; /* For hashing the name of a type */ + unsigned hash; /* For hashing the name of a type */ char *name; /* Name of the parser */ /* Allocate and initialize types[] and allocate stddt[] */
