Hello community, here is the log from the commit of package shapelib for openSUSE:Factory checked in at 2018-07-28 12:42:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shapelib (Old) and /work/SRC/openSUSE:Factory/.shapelib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shapelib" Sat Jul 28 12:42:22 2018 rev:2 rq:625205 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/shapelib/shapelib.changes 2015-05-30 12:34:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shapelib.new/shapelib.changes 2018-07-28 12:42:31.256670152 +0200 @@ -1,0 +2,10 @@ +Wed Jul 25 08:15:23 UTC 2018 - mplus...@suse.com + +- Update to version 1.4.1: + * See ChangeLog for details +- Drop no longer needed patches: + * shapelib_autotools.patch + * shapelib_backports.patch +- Refresh rpmlint-errors.patch + +------------------------------------------------------------------- Old: ---- shapelib-1.3.0.tar.gz shapelib_autotools.patch shapelib_backports.patch New: ---- shapelib-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shapelib.spec ++++++ --- /var/tmp/diff_new_pack.IqicdX/_old 2018-07-28 12:42:31.616670844 +0200 +++ /var/tmp/diff_new_pack.IqicdX/_new 2018-07-28 12:42:31.616670844 +0200 @@ -1,7 +1,7 @@ # # spec file for package shapelib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,31 +16,24 @@ # -%define so_ver 1 +%define so_ver 2 Name: shapelib -Version: 1.3.0 +Version: 1.4.1 Release: 0 Summary: Library for ESRI Shapefile Handling -License: (LGPL-2.0+ or MIT) and GPL-2.0+ and SUSE-Public-Domain +License: (LGPL-2.0-or-later OR MIT) AND GPL-2.0-or-later AND SUSE-Public-Domain Group: Productivity/Graphics/Other -Url: http://shapelib.maptools.org/ +URL: http://shapelib.maptools.org/ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM shapelib_autotools.patch asterios.dra...@gmail.com -- Use autotools (see http://bugzilla.maptools.org/show_bug.cgi?id=2447), patch taken from Fedora -Patch0: shapelib_autotools.patch -# PATCH-FIX-UPSTREAM shapelib_backports.patch asterios.dra...@gmail.com -- Backport some fixes from the gdal bundled shapelib, patch taken from Fedora -Patch1: shapelib_backports.patch # PATCH-FIX-UPSTREAM rpmlint-errors.patch -- Fix some of the rpmlint errors # to get package acceptable to Factory -Patch2: rpmlint-errors.patch -BuildRequires: autoconf -BuildRequires: automake +Patch0: rpmlint-errors.patch +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libproj-devel -BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig +BuildRequires: pkgconfig(proj) # dbfdump is also in perl-DBD-XBase Conflicts: perl-DBD-XBase -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Shapefile C Library provides the ability to write simple C programs for @@ -52,8 +45,8 @@ %package -n libshp-devel Summary: Development Environment for %{name} Group: Development/Libraries/C and C++ -Requires: libproj-devel Requires: libshp%{so_ver} = %{version} +Requires: pkgconfig(proj) Provides: shapelib-devel = %{version} %description -n libshp-devel @@ -77,43 +70,32 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Fix rpmlint warning "wrong-file-end-of-line-encoding" sed -i 's/\r$//' contrib/doc/shpsort.txt -# Fix non-executable tests -chmod +x tests/*.sh - -autoreconf -fvi %build -NOCONFIGURE=1 sh ./autogen.sh %configure \ --disable-static \ --disable-silent-rules make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # Remove libtool config files find %{buildroot} -type f -name "*.la" -delete -print -# Remove unneeded file (fix rpmlint warning "version-control-internal-file") -rm -f web/.cvsignore - %check # Contrib tests fail -make %{?_smp_mflags} check || : +make %{?_smp_mflags} check ||: %post -n libshp%{so_ver} -p /sbin/ldconfig - %postun -n libshp%{so_ver} -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc COPYING ChangeLog +%license COPYING +%doc ChangeLog %doc contrib/doc/ web/ %{_bindir}/Shape_PointInPoly %{_bindir}/dbfadd @@ -138,13 +120,11 @@ %{_bindir}/shpwkb %files -n libshp-devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/pkgconfig/shapelib.pc %{_libdir}/libshp.so %files -n libshp%{so_ver} -%defattr(-,root,root,-) %{_libdir}/libshp.so.%{so_ver}* %changelog ++++++ rpmlint-errors.patch ++++++ --- /var/tmp/diff_new_pack.IqicdX/_old 2018-07-28 12:42:31.632670874 +0200 +++ /var/tmp/diff_new_pack.IqicdX/_new 2018-07-28 12:42:31.636670882 +0200 @@ -1,7 +1,7 @@ -Index: shapelib-1.3.0/contrib/shpcentrd.c +Index: shapelib-1.4.1/contrib/shpcentrd.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpcentrd.c -+++ shapelib-1.3.0/contrib/shpcentrd.c +--- shapelib-1.4.1.orig/contrib/shpcentrd.c ++++ shapelib-1.4.1/contrib/shpcentrd.c @@ -156,4 +156,6 @@ int main( int argc, char ** argv ) DBFClose( old_DBF ); DBFClose( new_DBF ); @@ -9,21 +9,21 @@ + + return 0; } -Index: shapelib-1.3.0/contrib/shpdata.c +Index: shapelib-1.4.1/contrib/shpdata.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpdata.c -+++ shapelib-1.3.0/contrib/shpdata.c -@@ -126,4 +126,6 @@ int main( int argc, char ** argv ) +--- shapelib-1.4.1.orig/contrib/shpdata.c ++++ shapelib-1.4.1/contrib/shpdata.c +@@ -131,4 +131,6 @@ int main( int argc, char ** argv ) DBFClose( old_DBF ); printf ("\n"); + + return 0; } -Index: shapelib-1.3.0/contrib/shpdxf.c +Index: shapelib-1.4.1/contrib/shpdxf.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpdxf.c -+++ shapelib-1.3.0/contrib/shpdxf.c +--- shapelib-1.4.1.orig/contrib/shpdxf.c ++++ shapelib-1.4.1/contrib/shpdxf.c @@ -331,6 +331,8 @@ main (int argc, char **argv) SHPClose (shp); DBFClose (dbf); @@ -33,10 +33,10 @@ } -Index: shapelib-1.3.0/contrib/shpfix.c +Index: shapelib-1.4.1/contrib/shpfix.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpfix.c -+++ shapelib-1.3.0/contrib/shpfix.c +--- shapelib-1.4.1.orig/contrib/shpfix.c ++++ shapelib-1.4.1/contrib/shpfix.c @@ -107,4 +107,6 @@ int main( int argc, char ** argv ) SHPClose ( hSHP ); @@ -44,21 +44,21 @@ + + return 0; } -Index: shapelib-1.3.0/contrib/shpinfo.c +Index: shapelib-1.4.1/contrib/shpinfo.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpinfo.c -+++ shapelib-1.3.0/contrib/shpinfo.c -@@ -110,4 +110,6 @@ int main( int argc, char ** argv ) +--- shapelib-1.4.1.orig/contrib/shpinfo.c ++++ shapelib-1.4.1/contrib/shpinfo.c +@@ -115,4 +115,6 @@ int main( int argc, char ** argv ) SHPClose( hSHP ); + + return 0; } -Index: shapelib-1.3.0/contrib/shpproj.c +Index: shapelib-1.4.1/contrib/shpproj.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpproj.c -+++ shapelib-1.3.0/contrib/shpproj.c +--- shapelib-1.4.1.orig/contrib/shpproj.c ++++ shapelib-1.4.1/contrib/shpproj.c @@ -255,6 +255,8 @@ int main( int argc, char ** argv ) DBFClose( old_DBF ); DBFClose( new_DBF ); @@ -68,22 +68,22 @@ } -Index: shapelib-1.3.0/contrib/shpwkb.c +Index: shapelib-1.4.1/contrib/shpwkb.c =================================================================== ---- shapelib-1.3.0.orig/contrib/shpwkb.c -+++ shapelib-1.3.0/contrib/shpwkb.c -@@ -120,4 +120,6 @@ int main( int argc, char ** argv ) +--- shapelib-1.4.1.orig/contrib/shpwkb.c ++++ shapelib-1.4.1/contrib/shpwkb.c +@@ -126,4 +126,6 @@ int main( int argc, char ** argv ) if ( wkb_file ) fclose ( wkb_file ); printf ("\n"); + + return 0; } -Index: shapelib-1.3.0/shputils.c +Index: shapelib-1.4.1/shputils.c =================================================================== ---- shapelib-1.3.0.orig/shputils.c -+++ shapelib-1.3.0/shputils.c -@@ -897,6 +897,8 @@ int clip_boundary() +--- shapelib-1.4.1.orig/shputils.c ++++ shapelib-1.4.1/shputils.c +@@ -902,6 +902,8 @@ int clip_boundary() if (i2 == 0) return(0); /** SKIP RECORD **/ else return(1); /** WRITE RECORD **/ } /** End CUT **/ @@ -92,34 +92,3 @@ } -Index: shapelib-1.3.0/contrib/dbfinfo.c -=================================================================== ---- shapelib-1.3.0.orig/contrib/dbfinfo.c -+++ shapelib-1.3.0/contrib/dbfinfo.c -@@ -29,7 +29,7 @@ int main( int argc, char ** argv ) - DBFHandle hDBF; - int *panWidth, i, iRecord; - char szFormat[32], szField[1024]; -- char ftype[15], cTitle[32], nTitle[32]; -+ char ftype[20], cTitle[32], nTitle[32]; - int nWidth, nDecimals; - int cnWidth, cnDecimals; - DBFHandle cDBF; -Index: shapelib-1.3.0/contrib/shpgeo.c -=================================================================== ---- shapelib-1.3.0.orig/contrib/shpgeo.c -+++ shapelib-1.3.0/contrib/shpgeo.c -@@ -339,11 +339,12 @@ int obj_storage = 0; - int need_swap = 0, my_order, GeoType; - int use_Z = 0; - int use_M = 0; -+void* ptr; - - need_swap = 1; - need_swap = ((char*) (&need_swap))[0]; - -- realloc (stream_obj, obj_storage ); -+ ptr = realloc (stream_obj, obj_storage ); - - if ( need_swap ) { - ++++++ shapelib-1.3.0.tar.gz -> shapelib-1.4.1.tar.gz ++++++ ++++ 63551 lines of diff (skipped)
