From 2d23359260bed38858c1e27e6ab15bad92dcb573 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 12 Apr 2019 22:30:39 +0200 Subject: [PATCH 01/21] Re-define linker flags --- wildmagic5.spec | 57 ++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 5044c2d..1ddee11 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -6,10 +6,12 @@ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif +%undefine _ld_as_needed + Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 6%{?dist} +Release: 7%{?dist} License: Boost URL: http://www.geometrictools.com Source0: http://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -56,7 +58,7 @@ They are generally required when either using the library or developing with it or developing it. %prep -%setup -q -n GeometricTools +%autosetup -n GeometricTools -N dos2unix WildMagic5/SamplePhysics/SimplePendulum/SimplePendulum.cpp dos2unix WildMagic5/SampleMathematics/DistancePointEllipseEllipsoid/DistancePointEllipseEllipsoid.cpp @@ -68,15 +70,15 @@ dos2unix WildMagic5/SampleMathematics/makeapp.wm5 %patch1 -p0 %patch2 -p0 -sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG|g' WildMagic5/LibGraphics/Renderers/GlxRenderer/makerend.wm5 -sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread -DNDEBUG|g' WildMagic5/SamplePhysics/makeapp.wm5 -sed -i 's|@@LDFLAGS@@|%{__global_ldflags} -fPIC -pie -Wl,-z,now|g' WildMagic5/SamplePhysics/makeapp.wm5 -sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread -DNDEBUG|g' WildMagic5/SampleGraphics/makeapp.wm5 -sed -i 's|@@LDFLAGS@@|%{__global_ldflags} -fPIC -pie -Wl,-z,now|g' WildMagic5/SampleGraphics/makeapp.wm5 -sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread -DNDEBUG|g' WildMagic5/SampleImagics/makeapp.wm5 -sed -i 's|@@LDFLAGS@@|%{__global_ldflags} -fPIC -pie -Wl,-z,now|g' WildMagic5/SampleImagics/makeapp.wm5 -sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread -DNDEBUG|g' WildMagic5/SampleMathematics/makeapp.wm5 -sed -i 's|@@LDFLAGS@@|%{__global_ldflags} -fPIC -pie -Wl,-z,now|g' WildMagic5/SampleMathematics/makeapp.wm5 +sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/LibGraphics/Renderers/GlxRenderer/makerend.wm5 +sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/SamplePhysics/makeapp.wm5 +sed -i 's|@@LDFLAGS@@|%{__global_ldflags}|g' WildMagic5/SamplePhysics/makeapp.wm5 +sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/SampleGraphics/makeapp.wm5 +sed -i 's|@@LDFLAGS@@|%{__global_ldflags}|g' WildMagic5/SampleGraphics/makeapp.wm5 +sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/SampleImagics/makeapp.wm5 +sed -i 's|@@LDFLAGS@@|%{__global_ldflags}|g' WildMagic5/SampleImagics/makeapp.wm5 +sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/SampleMathematics/makeapp.wm5 +sed -i 's|@@LDFLAGS@@|%{__global_ldflags}|g' WildMagic5/SampleMathematics/makeapp.wm5 ##Fix soname bug for i in `find . -type f \( -name "*makefile.wm5" \)`; do @@ -87,33 +89,33 @@ sed -e 's|15|17|g' -i WildMagic5/LibGraphics/Renderers/GlxRenderer/makerend.wm5 %build ##Build LibCore --> LibMathematics -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -lpthread -Wl,--as-needed -lm" -export CFLAGS="%{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG" +export LDFLAGS="%{__global_ldflags} -lpthread -lm" +export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibCore -j1 -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Core" -export CFLAGS="%{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG" +export LDFLAGS="%{__global_ldflags} -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Core" +export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibMathematics -j1 ##Build LibPhysics -> LibImagics -> LibGraphics -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -Wl,--as-needed -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Core" -export CFLAGS="%{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG" +export LDFLAGS="%{__global_ldflags} -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Core" +export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibPhysics -j1 -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics" -export CFLAGS="%{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG" +export LDFLAGS="%{__global_ldflags} -lpthread -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics" +export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibImagics -j1 -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -L%{_libdir} -lGL -Wl,--as-needed -lGLU -L../../SDK/Library/ReleaseDynamic -lWm5Core" -export CFLAGS="%{optflags} -Wl,-z,relro -Wl,-z,now -fPIC -pthread -DNDEBUG" +export LDFLAGS="%{__global_ldflags} -Wl,-z,now -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -L%{_libdir} -lGL -lGLU -L../../SDK/Library/ReleaseDynamic -lWm5Core" +export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibGraphics -j1 ##Build LibApplications -export LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now \ - -L../../SDK/Library/ReleaseDynamic -lWm5Core -lWm5Mathematics -lWm5Graphics -Wl,--as-needed -lGL -lGLU \ - -Wl,--as-needed -L../../SDK/Library/ReleaseDynamic -lWm5Imagics -lWm5Physics" +export LDFLAGS="%{__global_ldflags} \ + -L../../SDK/Library/ReleaseDynamic -lWm5Core -lWm5Mathematics -lWm5Graphics -lGL -lGLU \ + -L../../SDK/Library/ReleaseDynamic -lWm5Imagics -lWm5Physics" -%global WILD_OPT_FLAGS %(echo "-c -D__LINUX__ -DWM5_USE_OPENGL %{optflags} -Wl,-z,relro -fPIC -Wl,-z,now -pthread -DNDEBUG") +%global WILD_OPT_FLAGS %(echo "-c -D__LINUX__ -DWM5_USE_OPENGL %{optflags} -pthread -DNDEBUG") make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibApplications CFLAGS="%{WILD_OPT_FLAGS}" ##Build sample applications @@ -272,7 +274,6 @@ done %ldconfig_scriptlets %files -%{!?_licensedir:%global license %doc} %license WildMagic5/License/LICENSE_1_0.txt %doc WildMagic5/Documentation/WildMagic5Overview.pdf %{_libdir}/*.so.* @@ -285,13 +286,15 @@ done %{_libexecdir}/WildMagic/ %files data -%{!?_licensedir:%global license %doc} %doc WildMagic5/Documentation/*.txt %doc WildMagic5/Documentation/Wm5InitTerm.pdf %license WildMagic5/License/LICENSE_1_0.txt %{_datadir}/WildMagic/ %changelog +* Fri Apr 12 2019 Antonio Trande - 5.17-7 +- Re-define linker flags + * Sun Feb 03 2019 Fedora Release Engineering - 5.17-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From fb1a4a1631eeb067ec7109f2bfa555143fa9451d Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 12 Apr 2019 22:59:09 +0200 Subject: [PATCH 02/21] Add -fPIC --- wildmagic5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 1ddee11..7af4a68 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -106,7 +106,7 @@ export LDFLAGS="%{__global_ldflags} -lpthread -L../../SDK/Library/ReleaseDynamic export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibImagics -j1 -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -L%{_libdir} -lGL -lGLU -L../../SDK/Library/ReleaseDynamic -lWm5Core" +export LDFLAGS="%{__global_ldflags} -L../../SDK/Library/ReleaseDynamic -lWm5Mathematics -L%{_libdir} -lGL -lGLU -L../../SDK/Library/ReleaseDynamic -lWm5Core" export CFLAGS="%{optflags} -pthread -DNDEBUG" make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibGraphics -j1 @@ -115,7 +115,7 @@ export LDFLAGS="%{__global_ldflags} \ -L../../SDK/Library/ReleaseDynamic -lWm5Core -lWm5Mathematics -lWm5Graphics -lGL -lGLU \ -L../../SDK/Library/ReleaseDynamic -lWm5Imagics -lWm5Physics" -%global WILD_OPT_FLAGS %(echo "-c -D__LINUX__ -DWM5_USE_OPENGL %{optflags} -pthread -DNDEBUG") +%global WILD_OPT_FLAGS %(echo "-c -D__LINUX__ -DWM5_USE_OPENGL %{optflags} -fPIC -pthread -DNDEBUG") make CFG=ReleaseDynamic -f makefile.wm5 -C WildMagic5/LibApplications CFLAGS="%{WILD_OPT_FLAGS}" ##Build sample applications From aba6b9586492c9bd251b99872e3c895110792815 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 12 Apr 2019 23:25:16 +0200 Subject: [PATCH 03/21] Fix URLs --- wildmagic5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 7af4a68..b0bc6e3 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -13,8 +13,8 @@ Summary: Wild Magic libraries Version: 5.17 Release: 7%{?dist} License: Boost -URL: http://www.geometrictools.com -Source0: http://www.geometrictools.com/Downloads/WildMagic5p17.zip +URL: https://www.geometrictools.com +Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip BuildRequires: freeglut-devel, mesa-libGL-devel, mesa-libGLU-devel, libXext-devel BuildRequires: libX11-devel, glibc-devel, libstdc++-devel, dos2unix From 0d2b8f82661b01095336f36443eb4fd2a684fa0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:29:55 +0000 Subject: [PATCH 04/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index b0bc6e3..3ae9a62 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 7%{?dist} +Release: 8%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -292,6 +292,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 5.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Apr 12 2019 Antonio Trande - 5.17-7 - Re-define linker flags From 94ab4891fc452bf691df1814db9410b50d3c0e4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:43:16 +0000 Subject: [PATCH 05/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 3ae9a62..b6de283 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 8%{?dist} +Release: 9%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -292,6 +292,9 @@ done %{_datadir}/WildMagic/ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 5.17-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ada7e17d036fb192168c74c3ac35fa29de73d893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:09:11 +0000 Subject: [PATCH 06/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index b6de283..7de7f6a 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 9%{?dist} +Release: 10%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -292,6 +292,9 @@ done %{_datadir}/WildMagic/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.17-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 5.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d3614e9c268a2391b3e606b60a0c80fc9beb70d7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:55:33 +0000 Subject: [PATCH 07/21] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- wildmagic5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wildmagic5.spec b/wildmagic5.spec index 7de7f6a..b27f8d2 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -16,6 +16,7 @@ License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip +BuildRequires: make BuildRequires: freeglut-devel, mesa-libGL-devel, mesa-libGLU-devel, libXext-devel BuildRequires: libX11-devel, glibc-devel, libstdc++-devel, dos2unix BuildRequires: gcc, gcc-c++ From 95c4a1e2343b5eda2f0e79dc22287f63f1fe5f15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:30:18 +0000 Subject: [PATCH 08/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index b27f8d2..e70caa4 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 10%{?dist} +Release: 11%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -293,6 +293,9 @@ done %{_datadir}/WildMagic/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.17-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 5.17-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8e9c72c64bfa2dacbdcb3503ef74e8de3e2f52d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:57:12 +0000 Subject: [PATCH 09/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index e70caa4..a7e3acc 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 11%{?dist} +Release: 12%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -293,6 +293,9 @@ done %{_datadir}/WildMagic/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.17-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 5.17-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5c8072bb669b7f825e7723addc5c202ff55865a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:28:40 +0000 Subject: [PATCH 10/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index a7e3acc..9ab8056 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -11,7 +11,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 12%{?dist} +Release: 13%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -293,6 +293,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.17-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.17-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c21838e15076e3a55fdfd291b2b6181a3fdf58c8 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 28 Jan 2022 19:56:47 +0100 Subject: [PATCH 11/21] Undefine _package_note_file --- wildmagic5.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 9ab8056..cac933a 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -6,6 +6,11 @@ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif +# Workaround for rhbz#2044028 +%if 0%{?fedora} > 35 +%undefine _package_note_file +%endif + %undefine _ld_as_needed Name: wildmagic5 @@ -293,8 +298,9 @@ done %{_datadir}/WildMagic/ %changelog -* Sat Jan 22 2022 Fedora Release Engineering - 5.17-13 +* Fri Jan 28 2022 Fedora Release Engineering - 5.17-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +- Undefine _package_note_file * Fri Jul 23 2021 Fedora Release Engineering - 5.17-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 277d923a95605331cf7cea637399694aae0176f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:25:51 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index cac933a..dc4b863 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -16,7 +16,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 13%{?dist} +Release: 14%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -298,6 +298,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.17-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 28 2022 Fedora Release Engineering - 5.17-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Undefine _package_note_file From eecd3c83d05ceeaaa5f2340f72325ae75e78d9fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:50:02 +0000 Subject: [PATCH 13/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index dc4b863..1a3deab 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -16,7 +16,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 14%{?dist} +Release: 15%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -298,6 +298,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.17-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 5.17-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d405c7a3744f02ae8f404709beb2e202054338a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:13:12 +0000 Subject: [PATCH 14/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 1a3deab..4d50dd4 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -16,7 +16,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 15%{?dist} +Release: 16%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -298,6 +298,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.17-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 5.17-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7e6ab33d0532c374ada87e162e4203e580e9d907 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:49:08 +0000 Subject: [PATCH 15/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wildmagic5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 4d50dd4..6f7c596 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -16,7 +16,7 @@ Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 16%{?dist} +Release: 17%{?dist} License: Boost URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip @@ -298,6 +298,9 @@ done %{_datadir}/WildMagic/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.17-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 5.17-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 48e9319956b1eb86e239df034997a199063f5c4b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 25 May 2024 21:36:11 +0200 Subject: [PATCH 16/21] SPEC file update --- wildmagic5.spec | 148 ++++++------------------------------------------ 1 file changed, 17 insertions(+), 131 deletions(-) diff --git a/wildmagic5.spec b/wildmagic5.spec index 6f7c596..f68787f 100644 --- a/wildmagic5.spec +++ b/wildmagic5.spec @@ -1,30 +1,28 @@ ##Source code includes PDF documentation that is copyrighted ##You may download them for your personal use from upstream website -## The RPM macro for the linker flags does not exist on EPEL -%if 0%{?epel} < 7 -%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} -%endif - -# Workaround for rhbz#2044028 -%if 0%{?fedora} > 35 %undefine _package_note_file -%endif - %undefine _ld_as_needed -Name: wildmagic5 +Name: wildmagic5 Summary: Wild Magic libraries Version: 5.17 -Release: 17%{?dist} -License: Boost +Release: %autorelease +License: BSL-1.0 URL: https://www.geometrictools.com Source0: https://www.geometrictools.com/Downloads/WildMagic5p17.zip BuildRequires: make -BuildRequires: freeglut-devel, mesa-libGL-devel, mesa-libGLU-devel, libXext-devel -BuildRequires: libX11-devel, glibc-devel, libstdc++-devel, dos2unix -BuildRequires: gcc, gcc-c++ +BuildRequires: freeglut-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: libXext-devel +BuildRequires: libX11-devel +BuildRequires: glibc-devel +BuildRequires: libstdc++-devel +BuildRequires: dos2unix +BuildRequires: gcc +BuildRequires: gcc-c++ Patch0: %{name}-fix-SimplePendulum_output_files.patch Patch1: %{name}-fix-DistancePointEllipseEllipsoid.patch @@ -72,9 +70,9 @@ dos2unix WildMagic5/SampleGraphics/makeapp.wm5 dos2unix WildMagic5/SamplePhysics/makeapp.wm5 dos2unix WildMagic5/SampleImagics/makeapp.wm5 dos2unix WildMagic5/SampleMathematics/makeapp.wm5 -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch -P 0 -p0 +%patch -P 1 -p0 +%patch -P 2 -p0 sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/LibGraphics/Renderers/GlxRenderer/makerend.wm5 sed -i 's|CFLAGS += -O2 -DNDEBUG|CFLAGS += %{optflags} -pthread -DNDEBUG|g' WildMagic5/SamplePhysics/makeapp.wm5 @@ -277,8 +275,6 @@ EOF done ######################################################################################## -%ldconfig_scriptlets - %files %license WildMagic5/License/LICENSE_1_0.txt %doc WildMagic5/Documentation/WildMagic5Overview.pdf @@ -298,114 +294,4 @@ done %{_datadir}/WildMagic/ %changelog -* Sat Jan 27 2024 Fedora Release Engineering - 5.17-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 5.17-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 5.17-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 5.17-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 28 2022 Fedora Release Engineering - 5.17-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -- Undefine _package_note_file - -* Fri Jul 23 2021 Fedora Release Engineering - 5.17-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 5.17-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 5.17-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 5.17-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 5.17-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 12 2019 Antonio Trande - 5.17-7 -- Re-define linker flags - -* Sun Feb 03 2019 Fedora Release Engineering - 5.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 5.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 22 2018 Antonio Trande - 5.17-4 -- Add gcc-c++ BR - -* Sat Feb 17 2018 Antonio Trande - 5.17-3 -- Use %%ldconfig_scriptlets - -* Fri Feb 09 2018 Fedora Release Engineering - 5.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Oct 13 2017 Antonio Trande - 5.17-1 -- Update to 5.17 - -* Thu Aug 03 2017 Fedora Release Engineering - 5.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 5.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 09 2017 Antonio Trande - 5.15-1 -- Update to 5.15 - -* Fri Feb 05 2016 Fedora Release Engineering - 5.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 12 2016 Antonio Trande - 5.14-1 -- Update to 5.14 - -* Thu Dec 10 2015 Antonio Trande - 5.13-13 -- Fix compilation flags of 'libWm5Applications.so' library - -* Wed Nov 04 2015 Antonio Trande - 5.13-12 -- Rebuild with -fPIC - -* Sat Oct 31 2015 Antonio Trande - 5.13-11 -- Hardened builds on - 5.13-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 29 2015 Antonio Trande - 5.13-9 -- Added global ldflags -- Defined global ldflags macro for EPEL6 - -* Tue Apr 28 2015 Antonio Trande - 5.13-8 -- Added DistancePointEllipseEllipsoid patch - -* Sat Apr 25 2015 Antonio Trande - 5.13-7 -- Fixed script's arguments -- Installed additional data files for execution of the samples - -* Sat Apr 18 2015 Antonio Trande - 5.13-6 -- Packaged some data files needed to graphic tests - -* Sat Apr 18 2015 Antonio Trande - 5.13-5 -- Removed source code from Sample* directories -- Packaged PDF documentation in the data sub-package - -* Thu Apr 16 2015 Antonio Trande - 5.13-4 -- %%build section re-arranged -- Set LDFLAGS/CFLAGS separately -- Built samples sub-package - -* Tue Apr 14 2015 Antonio Trande - 5.13-3 -- Set LDFLAGS - -* Sun Apr 12 2015 Antonio Trande - 5.13-2 -- Fixed BR packages -- Set C/C++ optimization flags - -* Sun Apr 12 2015 Antonio Trande - 5.13-1 -- First package +%autochangelog From 7c0261ff428e47fc1c5494d0a91c415008b2810f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:21:42 +0000 Subject: [PATCH 17/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5df75e7a713403e8e87609fc9544cf7a75f63e0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:02:26 +0000 Subject: [PATCH 18/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 64d2792a9c8ce73d4b03dc42b8a202b9a8629f40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:25:54 +0000 Subject: [PATCH 19/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0f30c02eb15e85a8914b1185e0d9fc6383d074fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:14:58 +0000 Subject: [PATCH 20/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From a50ec4b4e82c184c2c2c14f234102fbae4e5b225 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:49:16 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild