From a17a6ee1eb90d262fd63f229e377f45dc67dea7a Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Oct 04 2019 13:19:17 +0000
Subject: Rebuild for new freeglut.


---

diff --git a/smoldyn-freeglut.patch b/smoldyn-freeglut.patch
new file mode 100644
index 0000000..fc17725
--- /dev/null
+++ b/smoldyn-freeglut.patch
@@ -0,0 +1,35 @@
+--- CMakeLists.txt~	2019-09-19 11:56:56.000000000 -0500
++++ CMakeLists.txt	2019-09-19 12:00:30.716178022 -0500
+@@ -270,20 +270,20 @@
+ 		#find_library(GLUT_LIBRARIES NAMES libglut)
+ 	endif()
+ 
+-	if(GLUT_FOUND)
+-		set(GLUT_FOUND TRUE)
+-		message(STATUS "Glut found: '${GLUT_INCLUDE_DIR}', '${GLUT_LIBRARIES}'")
+-	elseif(GLUT_INCLUDE_DIR AND GLUT_LIBRARIES)
+-		set(GLUT_FOUND TRUE)
+-		message(STATUS "Glut found: '${GLUT_INCLUDE_DIR}', '${GLUT_LIBRARIES}'")
+-	else()
+-		set(GLUT_FOUND FALSE)
+-		message(FATAL_ERROR "Glut not found.  Building without OpenGL is possible.")
+-	endif()
++#	if(GLUT_FOUND)
++#		set(GLUT_FOUND TRUE)
++#		message(STATUS "Glut found: '${GLUT_INCLUDE_DIR}', '${GLUT_LIBRARIES}'")
++#	elseif(GLUT_INCLUDE_DIR AND GLUT_LIBRARIES)
++#		set(GLUT_FOUND TRUE)
++#		message(STATUS "Glut found: '${GLUT_INCLUDE_DIR}', '${GLUT_LIBRARIES}'")
++#	else()
++#		set(GLUT_FOUND FALSE)
++#		message(FATAL_ERROR "Glut not found.  Building without OpenGL is possible.")
++#	endif()
+ 
+ 	set(HAVE_OPENGL TRUE)
+-	include_directories(${GLUT_INCLUDE_DIR})
+-	list(APPEND DEP_LIBS ${GLUT_LIBRARIES})
++	include_directories(/usr/include/GL)
++	list(APPEND DEP_LIBS -lglut)
+ endif()
+ 
+ 
diff --git a/smoldyn.spec b/smoldyn.spec
index 01b5bd8..aa21c30 100644
--- a/smoldyn.spec
+++ b/smoldyn.spec
@@ -11,7 +11,7 @@
 Name:  smoldyn
 Summary: A particle-based spatial stochastic simulator
 Version: 2.58
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # The rxnparam.c and SurfaceParam.c source code files are in the public domain.
 #
@@ -28,6 +28,7 @@ Source0: %{url}/%{name}-%{version}.zip
 
 # Fix library paths according to the Fedora Project guidelines
 Patch0: %{name}-fix_libpaths.patch
+Patch1: smoldyn-freeglut.patch
 
 BuildRequires: boost-devel
 BuildRequires: cmake3
@@ -87,6 +88,7 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p0 -b .fix_libpaths
+%patch1 -p0
 
 # Copy license file
 mv source/lib/SFMT/LICENSE.txt source/lib/SFMT/SFMT-LICENSE.txt
@@ -147,7 +149,8 @@ mkdir -p build && pushd build
  -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
  -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
  -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
- -DCMAKE_SKIP_RPATH:BOOL=YES ..
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DHAVE_GL_FREEGLUT_H=TRUE ..
 %make_build V=1
 popd
 
@@ -170,6 +173,9 @@ popd
 %doc documentation/*
 
 %changelog
+* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 2.58-3
+- Rebuilt for new freeglut
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.58-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild