From 90a183396872f2961e1dbf7130cda883cec9c7c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:47:37 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 69d211a..124b15c 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 5%{?pre:.%pre}%{?dist} +Release: 6%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -92,6 +92,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4f37d9cd3a7622872d5f4891accba40289c167cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 10:59:53 +0100 Subject: [PATCH 02/22] Add mingw subpackages --- shapelib.spec | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 3 deletions(-) diff --git a/shapelib.spec b/shapelib.spec index 124b15c..7dd234c 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 6%{?pre:.%pre}%{?dist} +Release: 9%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -26,6 +26,17 @@ BuildRequires: proj-devel >= 4.4.1 # For man pages BuildRequires: rubygem-ronn +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw32-binutils +BuildRequires: mingw32-proj + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw64-binutils +BuildRequires: mingw64-proj + + %description The Shapefile C Library provides the ability to write simple C programs for reading, writing and updating (to a @@ -49,6 +60,55 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains various utility programs distributed with shapelib. +%package -n mingw32-%{name} +Summary: MinGW Windows %{name} library + +%description -n mingw32-%{name} +%{summary}. + + +%package -n mingw32-%{name}-static +Summary: Static version of the MinGW Windows %{name} library +Requires: mingw32-%{name} = %{version}-%{release} + +%description -n mingw32-%{name}-static +%{summary}. + + +%package -n mingw32-%{name}-tools +Summary: Tools for the MinGW Windows %{name} library +Requires: mingw32-%{name} = %{version}-%{release} + +%description -n mingw32-%{name}-tools +%{summary}. + + +%package -n mingw64-%{name} +Summary: MinGW Windows %{name} library + +%description -n mingw64-%{name} +%{summary}. + + +%package -n mingw64-%{name}-static +Summary: Static version of the MinGW Windows %{name} library +Requires: mingw64-%{name} = %{version}-%{release} + +%description -n mingw64-%{name}-static +%{summary}. + + +%package -n mingw64-%{name}-tools +Summary: Tools for the MinGW Windows %{name} library +Requires: mingw64-%{name} = %{version}-%{release} + +%description -n mingw64-%{name}-tools +%{summary}. + + +%{?mingw_debug_package} + + %prep %autosetup -a1 @@ -57,12 +117,22 @@ This package contains various utility programs distributed with shapelib. # Kill rpath autoreconf -ifv +# Native build +mkdir build_native +pushd build_native +%define _configure ../configure %configure --disable-static %make_build +popd + +# MinGW build +%mingw_configure +%mingw_make_build %install -%make_install +%make_install -C build_native +%mingw_make_install # Remove static libraries find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -72,7 +142,8 @@ ronn -r --date="$(LC_ALL=C date -u "+%Y-%m-%d")" --manual=%{name} man/*.md mkdir -p %{buildroot}%{_mandir}/man1/ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ -%ldconfig_scriptlets + +%mingw_debug_install_post %files @@ -90,8 +161,37 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %{_bindir}/* %{_mandir}/man1/*.1* +%files -n mingw32-%{name} +%license COPYING +%{mingw32_bindir}/libshp-2.dll +%{mingw32_includedir}/shapefil.h +%{mingw32_libdir}/libshp.dll.a +%{mingw32_libdir}/pkgconfig/shapelib.pc + +%files -n mingw32-%{name}-static +%{mingw32_libdir}/libshp.a + +%files -n mingw32-%{name}-tools +%{mingw32_bindir}/*.exe + +%files -n mingw64-%{name} +%license COPYING +%{mingw64_bindir}/libshp-2.dll +%{mingw64_includedir}/shapefil.h +%{mingw64_libdir}/libshp.dll.a +%{mingw64_libdir}/pkgconfig/shapelib.pc + +%files -n mingw64-%{name}-static +%{mingw64_libdir}/libshp.a + +%files -n mingw64-%{name}-tools +%{mingw64_bindir}/*.exe + %changelog +* Thu Feb 24 2022 Sandro Mani - 1.5.0-9 +- Add mingw subpackage + * Sat Jan 22 2022 Fedora Release Engineering - 1.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 8508255c25678205e1676b3dfc15c5dfa3f53f57 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 20:02:21 +0100 Subject: [PATCH 03/22] Make mingw subpackages noarch --- shapelib.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/shapelib.spec b/shapelib.spec index 7dd234c..2013873 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 9%{?pre:.%pre}%{?dist} +Release: 10%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -61,7 +61,8 @@ This package contains various utility programs distributed with shapelib. %package -n mingw32-%{name} -Summary: MinGW Windows %{name} library +Summary: MinGW Windows %{name} library +BuildArch: noarch %description -n mingw32-%{name} %{summary}. @@ -70,6 +71,7 @@ Summary: MinGW Windows %{name} library %package -n mingw32-%{name}-static Summary: Static version of the MinGW Windows %{name} library Requires: mingw32-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw32-%{name}-static %{summary}. @@ -78,13 +80,15 @@ Requires: mingw32-%{name} = %{version}-%{release} %package -n mingw32-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw32-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw32-%{name}-tools %{summary}. %package -n mingw64-%{name} -Summary: MinGW Windows %{name} library +Summary: MinGW Windows %{name} library +BuildArch: noarch %description -n mingw64-%{name} %{summary}. @@ -93,6 +97,7 @@ Summary: MinGW Windows %{name} library %package -n mingw64-%{name}-static Summary: Static version of the MinGW Windows %{name} library Requires: mingw64-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw64-%{name}-static %{summary}. @@ -101,6 +106,7 @@ Requires: mingw64-%{name} = %{version}-%{release} %package -n mingw64-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw64-%{name} = %{version}-%{release} +BuildArch: noarch %description -n mingw64-%{name}-tools %{summary}. @@ -189,6 +195,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Thu Feb 24 2022 Sandro Mani - 1.5.0-10 +- Make mingw subpackages noarch + * Thu Feb 24 2022 Sandro Mani - 1.5.0-9 - Add mingw subpackage From 5b329ef7e761a04a57cf1ba0ba7eb7b5644b4804 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 20:02:47 +0100 Subject: [PATCH 04/22] Make mingw subpackages noarch --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 2013873..f1ea9ab 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 10%{?pre:.%pre}%{?dist} +Release: 11%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -195,6 +195,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Thu Feb 24 2022 Sandro Mani - 1.5.0-11 +- Make mingw subpackages noarch + * Thu Feb 24 2022 Sandro Mani - 1.5.0-10 - Make mingw subpackages noarch From 7548e52ab002689cc7ed247e560f6966ef0697b7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 2 Mar 2022 13:36:10 +0100 Subject: [PATCH 05/22] Backport fix for CVE-2021-22570 --- df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch | 11 +++++++++++ shapelib.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch diff --git a/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch b/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch new file mode 100644 index 0000000..ea734cc --- /dev/null +++ b/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch @@ -0,0 +1,11 @@ +diff -rupN --no-dereference shapelib-1.5.0/contrib/shpsort.c shapelib-1.5.0-new/contrib/shpsort.c +--- shapelib-1.5.0/contrib/shpsort.c 2004-07-06 23:23:17.000000000 +0200 ++++ shapelib-1.5.0-new/contrib/shpsort.c 2022-03-02 13:35:48.322878882 +0100 +@@ -279,7 +279,6 @@ static char ** split(const char *arg, co + free(result[--i]); + } + free(result); +- free(copy); + return NULL; + } + result = tmp; diff --git a/shapelib.spec b/shapelib.spec index f1ea9ab..3c41bff 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 11%{?pre:.%pre}%{?dist} +Release: 12%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -18,6 +18,8 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz +# Backport fix for CVE-2022-0699 +Patch0: https://github.com/OSGeo/shapelib/commit/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch BuildRequires: automake autoconf libtool BuildRequires: gcc-c++ @@ -195,6 +197,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Wed Mar 02 2022 Sandro Mani - 1.5.0-12 +- Backport fix for CVE-2022-0699 + * Thu Feb 24 2022 Sandro Mani - 1.5.0-11 - Make mingw subpackages noarch From 31f14520796d6b1db1c5da8c9716ebd7432f97d0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 2 Mar 2022 13:44:54 +0100 Subject: [PATCH 06/22] Pass -p1 to autosetup --- shapelib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 3c41bff..14ad70f 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -118,7 +118,7 @@ BuildArch: noarch %prep -%autosetup -a1 +%autosetup -p1 -a1 %build From ee62d57c6d7e8c3d72f295f00c6983fb2bcf6ee1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 14:59:24 +0100 Subject: [PATCH 07/22] Rebuild with mingw-gcc-12 --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 14ad70f..f805179 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 12%{?pre:.%pre}%{?dist} +Release: 13%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -197,6 +197,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Mar 25 2022 Sandro Mani - 1.5.0-13 +- Rebuild with mingw-gcc-12 + * Wed Mar 02 2022 Sandro Mani - 1.5.0-12 - Backport fix for CVE-2022-0699 From a033f0c8c85cc987c84f1db1e997ae9d82e59a74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:29:52 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index f805179..7432ef1 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 13%{?pre:.%pre}%{?dist} +Release: 14%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -197,6 +197,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 25 2022 Sandro Mani - 1.5.0-13 - Rebuild with mingw-gcc-12 From c9ffd91f055db1a55792ee69402fbd99e8d34545 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:08:04 +0000 Subject: [PATCH 09/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 7432ef1..7fd66f5 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,7 +2,7 @@ Name: shapelib Version: 1.5.0 -Release: 14%{?pre:.%pre}%{?dist} +Release: 15%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -197,6 +197,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.5.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.5.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fc4555ecb3d9c45f28c23bba1e8eafb5c16c4f03 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 23 Feb 2023 15:45:11 -0500 Subject: [PATCH 10/22] Conditionalize mingw build --- shapelib.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 7fd66f5..bb140ea 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -1,5 +1,11 @@ #global pre RC1 +%if %{defined rhel} || %{defined flatpak} +%bcond_with mingw +%else +%bcond_without mingw +%endif + Name: shapelib Version: 1.5.0 Release: 15%{?pre:.%pre}%{?dist} @@ -28,6 +34,7 @@ BuildRequires: proj-devel >= 4.4.1 # For man pages BuildRequires: rubygem-ronn +%if %{with mingw} BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils @@ -37,6 +44,7 @@ BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-binutils BuildRequires: mingw64-proj +%endif %description @@ -62,6 +70,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains various utility programs distributed with shapelib. +%if %{with mingw} %package -n mingw32-%{name} Summary: MinGW Windows %{name} library BuildArch: noarch @@ -112,6 +121,7 @@ BuildArch: noarch %description -n mingw64-%{name}-tools %{summary}. +%endif %{?mingw_debug_package} @@ -133,14 +143,18 @@ pushd build_native %make_build popd +%if %{with mingw} # MinGW build %mingw_configure %mingw_make_build +%endif %install %make_install -C build_native +%if %{with mingw} %mingw_make_install +%endif # Remove static libraries find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -151,7 +165,7 @@ mkdir -p %{buildroot}%{_mandir}/man1/ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ -%mingw_debug_install_post +%{?mingw_debug_install_post} %files @@ -169,6 +183,7 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %{_bindir}/* %{_mandir}/man1/*.1* +%if %{with mingw} %files -n mingw32-%{name} %license COPYING %{mingw32_bindir}/libshp-2.dll @@ -194,6 +209,7 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %files -n mingw64-%{name}-tools %{mingw64_bindir}/*.exe +%endif %changelog From 4b21d92b84018b6b6b666332cd76787067edbcb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:32:41 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index bb140ea..d0290a2 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.5.0 -Release: 15%{?pre:.%pre}%{?dist} +Release: 16%{?pre:.%pre}%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -213,6 +213,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.5.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.5.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 16308c5f8d851b3a0ca7b2584ac4b95f0030bea0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 24 Dec 2023 10:03:15 +0100 Subject: [PATCH 12/22] Update to 1.6.0 --- .gitignore | 1 + ...996c541b3dc3f6bc8d589a140fdc8c544373.patch | 11 --------- shapelib.spec | 23 ++++++++++--------- sources | 2 +- 4 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch diff --git a/.gitignore b/.gitignore index 0267e3d..3a3ee65 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ shapelib-1.3.0b2.tar.gz /shapelib-1.4.1.tar.gz /shapelib-man.tar.gz /shapelib-1.5.0.tar.gz +/shapelib-1.6.0.tar.gz diff --git a/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch b/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch deleted file mode 100644 index ea734cc..0000000 --- a/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN --no-dereference shapelib-1.5.0/contrib/shpsort.c shapelib-1.5.0-new/contrib/shpsort.c ---- shapelib-1.5.0/contrib/shpsort.c 2004-07-06 23:23:17.000000000 +0200 -+++ shapelib-1.5.0-new/contrib/shpsort.c 2022-03-02 13:35:48.322878882 +0100 -@@ -279,7 +279,6 @@ static char ** split(const char *arg, co - free(result[--i]); - } - free(result); -- free(copy); - return NULL; - } - result = tmp; diff --git a/shapelib.spec b/shapelib.spec index d0290a2..ed86b05 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -7,15 +7,15 @@ %endif Name: shapelib -Version: 1.5.0 -Release: 16%{?pre:.%pre}%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: # - contrib/csv2shp.c: GPLv2+ # - contrib/dbfinfo.c: Public domain # - contrib/dbfcat.c: Public domain -License: (LGPLv2+ or MIT) and GPLv2+ and Public Domain +License: (LGPL-2.0-or-later OR MIT) AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain URL: http://shapelib.maptools.org/ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre}.tar.gz # Man pages from debian package @@ -24,8 +24,6 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz -# Backport fix for CVE-2022-0699 -Patch0: https://github.com/OSGeo/shapelib/commit/df1e996c541b3dc3f6bc8d589a140fdc8c544373.patch BuildRequires: automake autoconf libtool BuildRequires: gcc-c++ @@ -170,8 +168,8 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %files %doc README README.tree ChangeLog web/*.html -%license COPYING -%{_libdir}/libshp.so.2* +%license LICENSE* +%{_libdir}/libshp.so.4* %files devel %{_includedir}/shapefil.h @@ -185,8 +183,8 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %if %{with mingw} %files -n mingw32-%{name} -%license COPYING -%{mingw32_bindir}/libshp-2.dll +%license LICENSE* +%{mingw32_bindir}/libshp-4.dll %{mingw32_includedir}/shapefil.h %{mingw32_libdir}/libshp.dll.a %{mingw32_libdir}/pkgconfig/shapelib.pc @@ -198,8 +196,8 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %{mingw32_bindir}/*.exe %files -n mingw64-%{name} -%license COPYING -%{mingw64_bindir}/libshp-2.dll +%license LICENSE* +%{mingw64_bindir}/libshp-4.dll %{mingw64_includedir}/shapefil.h %{mingw64_libdir}/libshp.dll.a %{mingw64_libdir}/pkgconfig/shapelib.pc @@ -213,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Dec 22 2023 Sandro Mani - 1.6.0-1 +- Update to 1.6.0 + * Sat Jul 22 2023 Fedora Release Engineering - 1.5.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index e3e0194..4fbf211 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (shapelib-1.6.0.tar.gz) = cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc SHA512 (shapelib-man.tar.gz) = 0625355e51005b032c2ea441d888868fa13bcdee862d9c5bae5aa26cb98e40e7eeb414f52dc63d433692dbe3873d037740e8bf650a30e6e4d56b216d48bda6da -SHA512 (shapelib-1.5.0.tar.gz) = 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721 From 517b61bca8bd5cdf5900c6d7cad1c316dfad6fba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:50:07 +0000 Subject: [PATCH 13/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index ed86b05..906e5c9 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -211,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 22 2023 Sandro Mani - 1.6.0-1 - Update to 1.6.0 From 82589d31dca7e4d94ef1d90fc6043755da838fdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:23:46 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 906e5c9..55f1e06 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -211,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9046dfeb8ef498da4b6f02c815e11aced56e455e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 22 Jul 2024 23:34:11 +0200 Subject: [PATCH 15/22] Backport: Fix UTF8 hook functions --- ...f872566ea0d91d6b62fe01bfe39931db39aa.patch | 26 +++++++++++++++++++ shapelib.spec | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 316ff872566ea0d91d6b62fe01bfe39931db39aa.patch diff --git a/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch b/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch new file mode 100644 index 0000000..9a5803c --- /dev/null +++ b/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch @@ -0,0 +1,26 @@ +diff -rupN --no-dereference shapelib-1.6.0/safileio.c shapelib-1.6.0-new/safileio.c +--- shapelib-1.6.0/safileio.c 2023-12-20 18:43:17.000000000 +0100 ++++ shapelib-1.6.0-new/safileio.c 2024-07-22 23:33:55.876536234 +0200 +@@ -132,8 +132,10 @@ static wchar_t *Utf8ToWideChar(const cha + /* SAUtf8WFOpen */ + /************************************************************************/ + +-SAFile SAUtf8WFOpen(const char *pszFilename, const char *pszAccess) ++static SAFile SAUtf8WFOpen(const char *pszFilename, const char *pszAccess, ++ void *pvUserData) + { ++ (void)pvUserData; + SAFile file = NULL; + wchar_t *pwszFileName = Utf8ToWideChar(pszFilename); + wchar_t *pwszAccess = Utf8ToWideChar(pszAccess); +@@ -146,8 +148,9 @@ SAFile SAUtf8WFOpen(const char *pszFilen + return file; + } + +-int SAUtf8WRemove(const char *pszFilename) ++static int SAUtf8WRemove(const char *pszFilename, void *pvUserData) + { ++ (void)pvUserData; + wchar_t *pwszFileName = Utf8ToWideChar(pszFilename); + int rc = -1; + if (pwszFileName != NULL) diff --git a/shapelib.spec b/shapelib.spec index 55f1e06..18b7b54 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -24,6 +24,8 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz +# Backport: Fix UTF8 hook functions +Patch0: https://github.com/OSGeo/shapelib/commit/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch BuildRequires: automake autoconf libtool BuildRequires: gcc-c++ From faa14878f60a27dd271a5138a2a9990f15547a26 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 14 Aug 2024 14:16:53 +0200 Subject: [PATCH 16/22] Update to 1.6.1 --- .gitignore | 1 + ...f872566ea0d91d6b62fe01bfe39931db39aa.patch | 26 ------------------- shapelib.spec | 9 ++++--- sources | 2 +- 4 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 316ff872566ea0d91d6b62fe01bfe39931db39aa.patch diff --git a/.gitignore b/.gitignore index 3a3ee65..3151e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ shapelib-1.3.0b2.tar.gz /shapelib-man.tar.gz /shapelib-1.5.0.tar.gz /shapelib-1.6.0.tar.gz +/shapelib-1.6.1.tar.gz diff --git a/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch b/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch deleted file mode 100644 index 9a5803c..0000000 --- a/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rupN --no-dereference shapelib-1.6.0/safileio.c shapelib-1.6.0-new/safileio.c ---- shapelib-1.6.0/safileio.c 2023-12-20 18:43:17.000000000 +0100 -+++ shapelib-1.6.0-new/safileio.c 2024-07-22 23:33:55.876536234 +0200 -@@ -132,8 +132,10 @@ static wchar_t *Utf8ToWideChar(const cha - /* SAUtf8WFOpen */ - /************************************************************************/ - --SAFile SAUtf8WFOpen(const char *pszFilename, const char *pszAccess) -+static SAFile SAUtf8WFOpen(const char *pszFilename, const char *pszAccess, -+ void *pvUserData) - { -+ (void)pvUserData; - SAFile file = NULL; - wchar_t *pwszFileName = Utf8ToWideChar(pszFilename); - wchar_t *pwszAccess = Utf8ToWideChar(pszAccess); -@@ -146,8 +148,9 @@ SAFile SAUtf8WFOpen(const char *pszFilen - return file; - } - --int SAUtf8WRemove(const char *pszFilename) -+static int SAUtf8WRemove(const char *pszFilename, void *pvUserData) - { -+ (void)pvUserData; - wchar_t *pwszFileName = Utf8ToWideChar(pszFilename); - int rc = -1; - if (pwszFileName != NULL) diff --git a/shapelib.spec b/shapelib.spec index 18b7b54..5236e15 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -7,8 +7,8 @@ %endif Name: shapelib -Version: 1.6.0 -Release: 3%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -24,8 +24,6 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz -# Backport: Fix UTF8 hook functions -Patch0: https://github.com/OSGeo/shapelib/commit/316ff872566ea0d91d6b62fe01bfe39931db39aa.patch BuildRequires: automake autoconf libtool BuildRequires: gcc-c++ @@ -213,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Wed Aug 14 2024 Sandro Mani - 1.6.1-1 +- Update to 1.6.1 + * Sat Jul 20 2024 Fedora Release Engineering - 1.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 4fbf211..197fcc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (shapelib-1.6.0.tar.gz) = cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc +SHA512 (shapelib-1.6.1.tar.gz) = 66823f67e7c46017b16683a28d5c5783a799756d220c8ed1aa6dd7f971b41ca73dfd8c5674f214a0a35339f885b095e12b2ac52263968a6247b6895d43136e3f SHA512 (shapelib-man.tar.gz) = 0625355e51005b032c2ea441d888868fa13bcdee862d9c5bae5aa26cb98e40e7eeb414f52dc63d433692dbe3873d037740e8bf650a30e6e4d56b216d48bda6da From 8c7f273787bf1218fef654eecf1923370a6e8af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:33:13 +0000 Subject: [PATCH 17/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 5236e15..944c076 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -211,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 14 2024 Sandro Mani - 1.6.1-1 - Update to 1.6.1 From 1847cb4cf787c4052dbd9ce887cbafc09d484cc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:13:17 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index 944c076..1122b7f 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -211,6 +211,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 59519109c676398d94092d88c890a403e39f33bd Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Sep 2025 23:20:56 +0200 Subject: [PATCH 19/22] Update to 1.6.2 --- .gitignore | 1 + shapelib.spec | 70 ++++++++++++++++--------------------------- shapelib_bool.patch | 24 +++++++++++++++ shapelib_libver.patch | 13 ++++++++ sources | 2 +- 5 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 shapelib_bool.patch create mode 100644 shapelib_libver.patch diff --git a/.gitignore b/.gitignore index 3151e2c..3347119 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ shapelib-1.3.0b2.tar.gz /shapelib-1.5.0.tar.gz /shapelib-1.6.0.tar.gz /shapelib-1.6.1.tar.gz +/shapelib-1.6.2.tar.gz diff --git a/shapelib.spec b/shapelib.spec index 1122b7f..b4050a4 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -7,8 +7,8 @@ %endif Name: shapelib -Version: 1.6.1 -Release: 3%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -24,21 +24,24 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz +# Don't use bool as variable name as it is a reserved keyword in C23 +Patch0: shapelib_bool.patch +# Add library version suffix for mingw dlls +Patch1: shapelib_libver.patch -BuildRequires: automake autoconf libtool +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: make BuildRequires: proj-devel >= 4.4.1 # For man pages BuildRequires: rubygem-ronn %if %{with mingw} -BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-filesystem BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-proj -BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-binutils BuildRequires: mingw64-proj @@ -72,20 +75,13 @@ This package contains various utility programs distributed with shapelib. %package -n mingw32-%{name} Summary: MinGW Windows %{name} library BuildArch: noarch +Obsoletes: mingw32-%{name}-static < 1.6.2-1 +Provides: mingw32-%{name}-static = %{version}-%{release} %description -n mingw32-%{name} %{summary}. -%package -n mingw32-%{name}-static -Summary: Static version of the MinGW Windows %{name} library -Requires: mingw32-%{name} = %{version}-%{release} -BuildArch: noarch - -%description -n mingw32-%{name}-static -%{summary}. - - %package -n mingw32-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw32-%{name} = %{version}-%{release} @@ -98,20 +94,13 @@ BuildArch: noarch %package -n mingw64-%{name} Summary: MinGW Windows %{name} library BuildArch: noarch +Obsoletes: mingw64-%{name}-static < 1.6.2-1 +Provides: mingw64-%{name}-static = %{version}-%{release} %description -n mingw64-%{name} %{summary}. -%package -n mingw64-%{name}-static -Summary: Static version of the MinGW Windows %{name} library -Requires: mingw64-%{name} = %{version}-%{release} -BuildArch: noarch - -%description -n mingw64-%{name}-static -%{summary}. - - %package -n mingw64-%{name}-tools Summary: Tools for the MinGW Windows %{name} library Requires: mingw64-%{name} = %{version}-%{release} @@ -130,33 +119,25 @@ BuildArch: noarch %build -# Kill rpath -autoreconf -ifv - # Native build -mkdir build_native -pushd build_native -%define _configure ../configure -%configure --disable-static -%make_build -popd +%cmake -DBUILD_TESTING=OFF -DUSE_RPATH=OFF -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_INSTALL_CMAKEDIR=%{_libdir}/cmake/%{name} +%cmake_build %if %{with mingw} # MinGW build -%mingw_configure +MINGW32_CMAKE_ARGS="-DCMAKE_INSTALL_CMAKEDIR=%{mingw32_libdir}/cmake/%{name}" \ +MINGW64_CMAKE_ARGS="-DCMAKE_INSTALL_CMAKEDIR=%{mingw64_libdir}/cmake/%{name}" \ +%mingw_cmake -DBUILD_TESTING=OFF %mingw_make_build %endif %install -%make_install -C build_native +%cmake_install %if %{with mingw} %mingw_make_install %endif -# Remove static libraries -find %{buildroot} -name '*.la' -exec rm -f {} ';' - # Build man pages ronn -r --date="$(LC_ALL=C date -u "+%Y-%m-%d")" --manual=%{name} man/*.md mkdir -p %{buildroot}%{_mandir}/man1/ @@ -169,12 +150,14 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %files %doc README README.tree ChangeLog web/*.html %license LICENSE* +%{_libdir}/libshp.so.%{version} %{_libdir}/libshp.so.4* %files devel %{_includedir}/shapefil.h %{_libdir}/libshp.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name}/ %files tools %doc contrib/doc/ @@ -188,9 +171,7 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %{mingw32_includedir}/shapefil.h %{mingw32_libdir}/libshp.dll.a %{mingw32_libdir}/pkgconfig/shapelib.pc - -%files -n mingw32-%{name}-static -%{mingw32_libdir}/libshp.a +%{mingw32_libdir}/cmake/%{name}/ %files -n mingw32-%{name}-tools %{mingw32_bindir}/*.exe @@ -201,9 +182,7 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %{mingw64_includedir}/shapefil.h %{mingw64_libdir}/libshp.dll.a %{mingw64_libdir}/pkgconfig/shapelib.pc - -%files -n mingw64-%{name}-static -%{mingw64_libdir}/libshp.a +%{mingw64_libdir}/cmake/%{name}/ %files -n mingw64-%{name}-tools %{mingw64_bindir}/*.exe @@ -211,6 +190,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Tue Sep 23 2025 Sandro Mani - 1.6.2-1 +- Update to 1.6.2 + * Fri Jul 25 2025 Fedora Release Engineering - 1.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/shapelib_bool.patch b/shapelib_bool.patch new file mode 100644 index 0000000..07d6190 --- /dev/null +++ b/shapelib_bool.patch @@ -0,0 +1,24 @@ +diff -rupN shapelib-1.6.2/dbfadd.c shapelib-1.6.2-new/dbfadd.c +--- shapelib-1.6.2/dbfadd.c 2024-12-16 02:47:36.000000000 +0100 ++++ shapelib-1.6.2-new/dbfadd.c 2025-09-23 19:57:08.604461488 +0200 +@@ -45,7 +45,7 @@ int main(int argc, char **argv) + const int iRecord = DBFGetRecordCount(hDBF); + + SHPDate date; +- char bool; ++ char boolean; + + // Loop assigning the new field values. + for (int i = 0; i < DBFGetFieldCount(hDBF); i++) +@@ -64,9 +64,9 @@ int main(int argc, char **argv) + } + else if (DBFGetFieldInfo(hDBF, i, NULL, NULL, NULL) == FTLogical) + { +- if (1 == sscanf(argv[i + 2], "%c", &bool)) ++ if (1 == sscanf(argv[i + 2], "%c", &boolean)) + { +- DBFWriteLogicalAttribute(hDBF, iRecord, i, bool); ++ DBFWriteLogicalAttribute(hDBF, iRecord, i, boolean); + } + } + else diff --git a/shapelib_libver.patch b/shapelib_libver.patch new file mode 100644 index 0000000..26bdb8f --- /dev/null +++ b/shapelib_libver.patch @@ -0,0 +1,13 @@ +diff -rupN shapelib-1.6.2/CMakeLists.txt shapelib-1.6.2-new/CMakeLists.txt +--- shapelib-1.6.2/CMakeLists.txt 2025-09-23 17:40:50.000000000 +0200 ++++ shapelib-1.6.2-new/CMakeLists.txt 2025-09-23 22:28:21.851170095 +0200 +@@ -176,6 +176,9 @@ set_target_properties(${PACKAGE} PROPERT + SOVERSION ${shp_SOVERSION} + VERSION ${shp_VERSION} + ) ++if(MINGW) ++ set_target_properties(${PACKAGE} PROPERTIES SUFFIX "-${shp_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") ++endif(MINGW) + + if(USE_RPATH) + set_target_properties(${PACKAGE} PROPERTIES diff --git a/sources b/sources index 197fcc9..475f918 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (shapelib-1.6.1.tar.gz) = 66823f67e7c46017b16683a28d5c5783a799756d220c8ed1aa6dd7f971b41ca73dfd8c5674f214a0a35339f885b095e12b2ac52263968a6247b6895d43136e3f +SHA512 (shapelib-1.6.2.tar.gz) = 5537ede3433d293f8b7cae9b62e6247c2a2ec02330de594d02e9359dfa4dca43e63fa023124340362bf7535c04f05c2f73dd4238e92e67575252a784efb35c46 SHA512 (shapelib-man.tar.gz) = 0625355e51005b032c2ea441d888868fa13bcdee862d9c5bae5aa26cb98e40e7eeb414f52dc63d433692dbe3873d037740e8bf650a30e6e4d56b216d48bda6da From d4255b8ee054fe2a08b31f751fe7d61f2cf117c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:58:14 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index b4050a4..b328e7d 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -190,6 +190,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 23 2025 Sandro Mani - 1.6.2-1 - Update to 1.6.2 From 34b8e99e0bd44f72aa6e28fc25e94ac181beab40 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 19 Mar 2026 14:39:18 +0100 Subject: [PATCH 21/22] Update to 1.6.3 --- .gitignore | 1 + shapelib.spec | 9 +++++---- shapelib_bool.patch | 24 ------------------------ shapelib_libver.patch | 6 +++--- sources | 2 +- 5 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 shapelib_bool.patch diff --git a/.gitignore b/.gitignore index 3347119..eb4c03f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ shapelib-1.3.0b2.tar.gz /shapelib-1.6.0.tar.gz /shapelib-1.6.1.tar.gz /shapelib-1.6.2.tar.gz +/shapelib-1.6.3.tar.gz diff --git a/shapelib.spec b/shapelib.spec index b328e7d..bb0d855 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -7,8 +7,8 @@ %endif Name: shapelib -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -24,8 +24,6 @@ Source0: http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre} # tar -czf shapelib-man.tar.gz man/ # rm -r man Source1: %{name}-man.tar.gz -# Don't use bool as variable name as it is a reserved keyword in C23 -Patch0: shapelib_bool.patch # Add library version suffix for mingw dlls Patch1: shapelib_libver.patch @@ -190,6 +188,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Thu Mar 19 2026 Sandro Mani - 1.6.3-1 +- Update to 1.6.3 + * Sat Jan 17 2026 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild diff --git a/shapelib_bool.patch b/shapelib_bool.patch deleted file mode 100644 index 07d6190..0000000 --- a/shapelib_bool.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rupN shapelib-1.6.2/dbfadd.c shapelib-1.6.2-new/dbfadd.c ---- shapelib-1.6.2/dbfadd.c 2024-12-16 02:47:36.000000000 +0100 -+++ shapelib-1.6.2-new/dbfadd.c 2025-09-23 19:57:08.604461488 +0200 -@@ -45,7 +45,7 @@ int main(int argc, char **argv) - const int iRecord = DBFGetRecordCount(hDBF); - - SHPDate date; -- char bool; -+ char boolean; - - // Loop assigning the new field values. - for (int i = 0; i < DBFGetFieldCount(hDBF); i++) -@@ -64,9 +64,9 @@ int main(int argc, char **argv) - } - else if (DBFGetFieldInfo(hDBF, i, NULL, NULL, NULL) == FTLogical) - { -- if (1 == sscanf(argv[i + 2], "%c", &bool)) -+ if (1 == sscanf(argv[i + 2], "%c", &boolean)) - { -- DBFWriteLogicalAttribute(hDBF, iRecord, i, bool); -+ DBFWriteLogicalAttribute(hDBF, iRecord, i, boolean); - } - } - else diff --git a/shapelib_libver.patch b/shapelib_libver.patch index 26bdb8f..f8ba064 100644 --- a/shapelib_libver.patch +++ b/shapelib_libver.patch @@ -1,6 +1,6 @@ -diff -rupN shapelib-1.6.2/CMakeLists.txt shapelib-1.6.2-new/CMakeLists.txt ---- shapelib-1.6.2/CMakeLists.txt 2025-09-23 17:40:50.000000000 +0200 -+++ shapelib-1.6.2-new/CMakeLists.txt 2025-09-23 22:28:21.851170095 +0200 +diff -rupN --no-dereference shapelib-1.6.3/CMakeLists.txt shapelib-1.6.3-new/CMakeLists.txt +--- shapelib-1.6.3/CMakeLists.txt 2026-03-18 17:27:15.000000000 +0100 ++++ shapelib-1.6.3-new/CMakeLists.txt 2026-03-19 14:28:33.599270296 +0100 @@ -176,6 +176,9 @@ set_target_properties(${PACKAGE} PROPERT SOVERSION ${shp_SOVERSION} VERSION ${shp_VERSION} diff --git a/sources b/sources index 475f918..412e1b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (shapelib-1.6.2.tar.gz) = 5537ede3433d293f8b7cae9b62e6247c2a2ec02330de594d02e9359dfa4dca43e63fa023124340362bf7535c04f05c2f73dd4238e92e67575252a784efb35c46 +SHA512 (shapelib-1.6.3.tar.gz) = 9cb5625f6b94ca2f48c222b5adaee0d9955b70f621c51bc54a47e922e9b6ac547bc3efaf67df56ecb3829d9313d57c85afa46cf00a7e03f779c694407e371943 SHA512 (shapelib-man.tar.gz) = 0625355e51005b032c2ea441d888868fa13bcdee862d9c5bae5aa26cb98e40e7eeb414f52dc63d433692dbe3873d037740e8bf650a30e6e4d56b216d48bda6da From 5fd520caa1bdef4f947ac26a85293db124762cf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:28:20 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- shapelib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shapelib.spec b/shapelib.spec index bb0d855..2f183d3 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -8,7 +8,7 @@ Name: shapelib Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C library for handling ESRI Shapefiles # The core library is dual-licensed LGPLv2 or MIT. # Some contributed files have different licenses: @@ -188,6 +188,9 @@ install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Mar 19 2026 Sandro Mani - 1.6.3-1 - Update to 1.6.3