From 8973f5c89550ab742730a102d170a2de44d49a91 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 31 Jan 2020 09:47:22 -0600 Subject: [PATCH] Fix FTBFS. --- common.patch | 11 +++++++++++ freeglut.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 common.patch diff --git a/common.patch b/common.patch new file mode 100644 index 0000000..5bbf1da --- /dev/null +++ b/common.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt~ 2019-09-25 15:43:34.000000000 -0500 ++++ CMakeLists.txt 2020-01-31 09:26:24.104743210 -0600 +@@ -302,7 +302,7 @@ + ENDIF() + + IF(CMAKE_COMPILER_IS_GNUCC) +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fcommon") + IF(NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + # not setting -ansi as EGL/KHR headers doesn't support it + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") diff --git a/freeglut.spec b/freeglut.spec index d595f73..70493ae 100644 --- a/freeglut.spec +++ b/freeglut.spec @@ -1,11 +1,12 @@ Summary: A freely licensed alternative to the GLUT library Name: freeglut Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://freeglut.sourceforge.net Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # For the manpages Source1: https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz +Patch0: common.patch License: MIT BuildRequires: gcc @@ -49,6 +50,7 @@ license. %prep %setup -q -a 1 +%patch0 -p0 %build %{cmake} -DFREEGLUT_BUILD_STATIC_LIBS=OFF . @@ -78,6 +80,9 @@ install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3 %{_libdir}/cmake/FreeGLUT/* %changelog +* Fri Jan 31 2020 Gwyn Ciesla - 3.2.1-3 +- Fix FTBFS + * Tue Jan 28 2020 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild