Architecture specific change in rpms/SFCGAL.git - Arch-excludes - Fedora mailing-lists

30 Nov 2021

The package rpms/SFCGAL.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/SFCGAL.git/commit/?id=554a0f92121eff....
Change:
-ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 825ddc1f8bba2d940bf6217d672e74db74d54e19
Author: Paul Wouters paul.wouters@aiven.io
Date:   Mon Nov 22 12:43:07 2021 -0500
Remove obsoleted CGAL_patches patch

diff --git a/SFCGAL.spec b/SFCGAL.spec
index df441ea..a5c530b 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -14,9 +14,6 @@ BuildRequires: boost-devel
 BuildRequires: mpfr-devel
 BuildRequires: gmp-devel
-#https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246
-Patch1: SFCGAL-1.3.10-PR246.patch
-
 %description
 SFCGAL is a C++ wrapper library around CGAL with the aim of supporting
 ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D operations.
commit 1d4bd207d102dca6d756b2e27e4b5ba9f0d4eb25
Author: Paul Wouters paul.wouters@aiven.io
Date:   Mon Nov 22 11:22:41 2021 -0500
- Resolves: rhbz#2023547 update to version 1.4.0
diff --git a/.gitignore b/.gitignore
index 8c84152..1b7d5ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /SFCGAL-v1.3.10.tar.bz2
+/SFCGAL-v1.4.0.tar.bz2
diff --git a/SFCGAL.spec b/SFCGAL.spec
index 9d5e103..df441ea 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -1,7 +1,7 @@
 Summary: C++ wrapper library around CGAL for PostGIS
 Name: SFCGAL
-Version: 1.3.10
-Release: 8%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 License: LGPLv2
 URL: https://gitlab.com/Oslandia/SFCGAL/
 Source: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%%7Bversion%7D/SFCGAL-v%%7Bver...
@@ -60,6 +60,9 @@ Development headers and libraries for SFCGAL.
 %doc example/ doc/html
%changelog
+* Mon Nov 22 2021 Paul Wouters paul.wouters@aiven.io - 1.4.0-1
+- Resolves: rhbz#2023547 update to version 1.4.0
+
 * Tue Nov 16 2021 Paul Wouters paul.wouters@aiven.io - 1.3.10-8
 - rebuilt against CGAL that was fixed for arm build
diff --git a/sources b/sources
index 2ff5f15..12f0b94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (SFCGAL-v1.3.10.tar.bz2) = 40c41aac94e0636f12682ce74449e9bf224892ff235bff998b3b4ffef6dfa6b80d0396df03488f89948a4211f6c7defd62c4cb2aee9dc0a00a75466306bf5b31
+SHA512 (SFCGAL-v1.4.0.tar.bz2) = 8393c382642df5808e11a842328c2554a7e5ca7ee6a6d09c8811be5638ff9c90fc3266685cabfff84d4dc2b0c2d7be70742ee2cb85988dc757ea74e6fc98ab87
commit 554a0f92121eff5c45222f2e8fc241bf018ebf7f
Author: Paul Wouters paul.wouters@aiven.io
Date:   Tue Nov 16 12:53:58 2021 -0500
Ensure CGAL-devel >= 5.3-3 for arm fix
diff --git a/SFCGAL.spec b/SFCGAL.spec
index 6aba80e..9d5e103 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -1,12 +1,12 @@
 Summary: C++ wrapper library around CGAL for PostGIS
 Name: SFCGAL
 Version: 1.3.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2
 URL: https://gitlab.com/Oslandia/SFCGAL/
 Source: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%%7Bversion%7D/SFCGAL-v%%7Bver...
-BuildRequires: CGAL-devel
+BuildRequires: CGAL-devel >= 5.3-3
 BuildRequires: gcc-c++
 BuildRequires: cmake
 BuildRequires: doxygen
@@ -17,9 +17,6 @@ BuildRequires: gmp-devel
 #https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246
 Patch1: SFCGAL-1.3.10-PR246.patch
-# See https://gitlab.com/Oslandia/SFCGAL/-/issues/245
-ExcludeArch: armv7hl
-
 %description
 SFCGAL is a C++ wrapper library around CGAL with the aim of supporting
 ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D operations.
@@ -63,6 +60,9 @@ Development headers and libraries for SFCGAL.
 %doc example/ doc/html
%changelog
+* Tue Nov 16 2021 Paul Wouters paul.wouters@aiven.io - 1.3.10-8
+- rebuilt against CGAL that was fixed for arm build
+
 * Fri Aug 06 2021 Jonathan Wakely jwakely@redhat.com - 1.3.10-7
 - Rebuilt for Boost 1.76
commit 7eb47f85274c9f4959744abb0857475735a9f555
Author: Jonathan Wakely jwakely@redhat.com
Date:   Fri Aug 6 22:00:48 2021 +0100
Rebuilt for Boost 1.76
diff --git a/SFCGAL.spec b/SFCGAL.spec
index 57b68c2..6aba80e 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -1,7 +1,7 @@
 Summary: C++ wrapper library around CGAL for PostGIS
 Name: SFCGAL
 Version: 1.3.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2
 URL: https://gitlab.com/Oslandia/SFCGAL/
 Source: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%%7Bversion%7D/SFCGAL-v%%7Bver...
@@ -63,6 +63,9 @@ Development headers and libraries for SFCGAL.
 %doc example/ doc/html
%changelog
+* Fri Aug 06 2021 Jonathan Wakely jwakely@redhat.com - 1.3.10-7
+- Rebuilt for Boost 1.76
+
 * Tue Jul 27 2021 Paul Wouters paul.wouters@aiven.io - 1.3.10-6
 - Patch for CGAL 5.3 (https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246)
commit a894d5c15867a744dfb588883fc0a7b2e53f9045
Author: Paul Wouters paul.wouters@aiven.io
Date:   Tue Jul 27 19:03:38 2021 -0400
fixup for patch -p0 default
diff --git a/SFCGAL-1.3.10-PR246.patch b/SFCGAL-1.3.10-PR246.patch
index a608cbd..a142c57 100644
--- a/SFCGAL-1.3.10-PR246.patch
+++ b/SFCGAL-1.3.10-PR246.patch
@@ -1,6 +1,6 @@
-diff -Naur SFCGAL-v1.3.10.old/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h SFCGAL-v1.3.10/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h
---- SFCGAL-v1.3.10.old/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-04-17 02:41:42.000000000 -0400
-+++ SFCGAL-v1.3.10/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-07-27 18:01:45.230491155 -0400
+diff -Naur CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h
+--- CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-04-17 02:41:42.000000000 -0400
++++ CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-07-27 18:01:45.230491155 -0400
 @@ -888,16 +888,16 @@
if (!first_hedge->is_border())
commit 4d75f791d0b4cc24e00e2e69edb0df9ba35105e3
Author: Paul Wouters paul.wouters@aiven.io
Date:   Tue Jul 27 18:25:29 2021 -0400
- Patch for CGAL 5.3 (https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246)
diff --git a/SFCGAL-1.3.10-PR246.patch b/SFCGAL-1.3.10-PR246.patch
new file mode 100644
index 0000000..a608cbd
--- /dev/null
+++ b/SFCGAL-1.3.10-PR246.patch
@@ -0,0 +1,33 @@
+diff -Naur SFCGAL-v1.3.10.old/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h SFCGAL-v1.3.10/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h
+--- SFCGAL-v1.3.10.old/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-04-17 02:41:42.000000000 -0400
++++ SFCGAL-v1.3.10/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h	2021-07-27 18:01:45.230491155 -0400
+@@ -888,16 +888,16 @@
+ 
+       if (!first_hedge->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(first_hedge,Dart_handle(NULL)));
++          .insert(std::make_pair(first_hedge,Dart_handle(nullptr)));
+       if (!first_hedge->opposite()->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(first_hedge->opposite(),Dart_handle(NULL)));
++          .insert(std::make_pair(first_hedge->opposite(),Dart_handle(nullptr)));
+       if (!second_hedge->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(second_hedge,Dart_handle(NULL)));
++          .insert(std::make_pair(second_hedge,Dart_handle(nullptr)));
+       if (!second_hedge->opposite()->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(second_hedge->opposite(),Dart_handle(NULL)));
++          .insert(std::make_pair(second_hedge->opposite(),Dart_handle(nullptr)));
+     }
+ 
+ #ifdef CGAL_COREFINEMENT_DEBUG
+@@ -964,7 +964,7 @@
+ #ifndef NDEBUG
+     for(typename Halfedge_to_dart_map::iterator it=selected_hedge_to_dart.begin();
+         it!=selected_hedge_to_dart.end(); ++it)
+-      CGAL_assertion(it->second!=Dart_handle(NULL));
++      CGAL_assertion(it->second!=Dart_handle(nullptr));
+ #endif
+ 
+     CGAL_assertion(final_map().is_valid());
diff --git a/SFCGAL.spec b/SFCGAL.spec
index 993754b..57b68c2 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -1,7 +1,7 @@
 Summary: C++ wrapper library around CGAL for PostGIS
 Name: SFCGAL
 Version: 1.3.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2
 URL: https://gitlab.com/Oslandia/SFCGAL/
 Source: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%%7Bversion%7D/SFCGAL-v%%7Bver...
@@ -14,6 +14,9 @@ BuildRequires: boost-devel
 BuildRequires: mpfr-devel
 BuildRequires: gmp-devel
+#https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246
+Patch1: SFCGAL-1.3.10-PR246.patch
+
 # See https://gitlab.com/Oslandia/SFCGAL/-/issues/245
 ExcludeArch: armv7hl
@@ -60,6 +63,9 @@ Development headers and libraries for SFCGAL.
 %doc example/ doc/html
%changelog
+* Tue Jul 27 2021 Paul Wouters paul.wouters@aiven.io - 1.3.10-6
+- Patch for CGAL 5.3 (https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246)
+
 * Wed Jul 21 2021 Fedora Release Engineering releng@fedoraproject.org - 1.3.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit cffe86f558489c919f1d025f5fbb56b0438ebd85
Author: Fedora Release Engineering releng@fedoraproject.org
Date:   Wed Jul 21 17:03:23 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/SFCGAL.spec b/SFCGAL.spec
index ddac825..993754b 100644
--- a/SFCGAL.spec
+++ b/SFCGAL.spec
@@ -1,7 +1,7 @@
 Summary: C++ wrapper library around CGAL for PostGIS
 Name: SFCGAL
 Version: 1.3.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 URL: https://gitlab.com/Oslandia/SFCGAL/
 Source: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%%7Bversion%7D/SFCGAL-v%%7Bver...
@@ -60,6 +60,9 @@ Development headers and libraries for SFCGAL.
 %doc example/ doc/html
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering releng@fedoraproject.org - 1.3.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon May 31 2021 Paul Wouters paul.wouters@aiven.io - 1.3.10-4
 - Resolves: rhbz#1965111 package review items (build and ship html docs)
commit 7960a1d4d8f5c36eed4edac3befaaebaf19a1504
Author: Fedora Release Engineering releng@fedoraproject.org
Date:   Wed Jul 21 12:08:22 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org

    