From 70493c25177da8abe26cb33c0122822deb2847f9e3c84f9453e5c72f47e39cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 13 Mar 2015 13:14:15 +0000
Subject: [PATCH] - Version bump to 3.0.0   * Now with cmake build system   *
 Various small fixes around here and there - no upstream changelog     apart
 from VCS - Remove some more obsolete things from spec now when we use cmake

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freeglut?expand=0&rev=23
---
 freeglut-2.8.1.tar.gz |  3 ---
 freeglut-3.0.0.tar.gz |  3 +++
 freeglut.changes      |  9 ++++++++
 freeglut.spec         | 48 +++++++++++++++++++------------------------
 4 files changed, 33 insertions(+), 30 deletions(-)
 delete mode 100644 freeglut-2.8.1.tar.gz
 create mode 100644 freeglut-3.0.0.tar.gz

diff --git a/freeglut-2.8.1.tar.gz b/freeglut-2.8.1.tar.gz
deleted file mode 100644
index f1ffdbd..0000000
--- a/freeglut-2.8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a
-size 1005343
diff --git a/freeglut-3.0.0.tar.gz b/freeglut-3.0.0.tar.gz
new file mode 100644
index 0000000..9760ccc
--- /dev/null
+++ b/freeglut-3.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2
+size 419095
diff --git a/freeglut.changes b/freeglut.changes
index 484752e..8618861 100644
--- a/freeglut.changes
+++ b/freeglut.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 13 13:12:11 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 3.0.0
+  * Now with cmake build system
+  * Various small fixes around here and there - no upstream changelog
+    apart from VCS
+- Remove some more obsolete things from spec now when we use cmake
+
 -------------------------------------------------------------------
 Fri Mar 13 12:56:54 UTC 2015 - tchvatal@suse.com
 
diff --git a/freeglut.spec b/freeglut.spec
index 777710e..1677721 100644
--- a/freeglut.spec
+++ b/freeglut.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define debug 0
+%define _libname libglut3
 Name:           freeglut
-Version:        2.8.1
+Version:        3.0.0
 Release:        0
 Summary:        Freely licensed alternative to the GLUT library
 License:        MIT
@@ -27,8 +27,8 @@ Url:            http://freeglut.sourceforge.net/
 Source:         https://downloads.sourceforge.net/project/freeglut/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        glutman.tar.bz2
 Source2:        baselibs.conf
+BuildRequires:  cmake
 BuildRequires:  gcc-c++
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
@@ -52,11 +52,11 @@ GLUT (and freeglut) allow the user to create and manage windows
 containing OpenGL contexts and also read the mouse, keyboard, and
 joystick functions on a wide range of platforms.
 
-%package -n libglut3
+%package -n %_libname
 Summary:        Freely licensed alternative to the GLUT library
 Group:          Development/Libraries/X11
 
-%description -n libglut3
+%description -n %_libname
 Freeglut is a completely open source alternative to the OpenGL Utility
 Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard to
 support the sample programs in the second edition OpenGL Redbook. Since
@@ -70,7 +70,7 @@ joystick functions on a wide range of platforms.
 %package devel
 Summary:        Development libraries, includes and man pages for freeglut (GLUT Library)
 Group:          Development/Libraries/X11
-Requires:       libglut3 = %{version}
+Requires:       %_libname = %{version}
 Requires:       pkgconfig(gl)
 Requires:       pkgconfig(glu)
 Provides:       mesaglut-devel = 7.11
@@ -114,47 +114,41 @@ joystick functions on a wide range of platforms.
 %setup -q -b0 -b1
 
 %build
-./autogen.sh
-%configure \
-  --enable-replace-glut \
-%if %{debug}
-  --enable-debug \
-%endif
-  --disable-static
+%cmake \
+    -DFREEGLUT_BUILD_STATIC_LIBS=OFF
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%cmake_install
+
 # install demo files
 install -d %{buildroot}%{_libexecdir}/freeglut
-for i in shapes smooth_opengl3 spaceball subwin CallbackMaker; do
-  install progs/demos/$i/.libs/$i %{buildroot}%{_libexecdir}/freeglut/$i
+pushd build/bin/ > /dev/null
+for i in *; do
+    install $i %{buildroot}%{_libexecdir}/freeglut/$i
 done
-install progs/demos/Fractals/.libs/fractals %{buildroot}%{_libexecdir}/freeglut/fractals
-install progs/demos/Fractals_random/.libs/fractals_random %{buildroot}%{_libexecdir}/freeglut/fractals_random
-install progs/demos/One/.libs/one %{buildroot}%{_libexecdir}/freeglut/one
-install progs/demos/Lorenz/.libs/lorenz %{buildroot}%{_libexecdir}/freeglut/lorenz
-# glut Manual Pages
+popd > /dev/null
+
+# old glut Manual Pages
 mkdir -p %{buildroot}/%{_mandir}/man3
 for i in ../glut-3.7/man/glut/glut*; do
   install -m 644 $i %{buildroot}/%{_mandir}/man3/`basename $i man`3
 done
-find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -n libglut3 -p /sbin/ldconfig
+%post -n %_libname -p /sbin/ldconfig
 
-%postun -n libglut3 -p /sbin/ldconfig
+%postun -n %_libname -p /sbin/ldconfig
 
-%files -n libglut3
+%files -n %_libname
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING README
 %{_libdir}/libglut.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc ChangeLog
 %{_includedir}/GL
 %{_libdir}/libglut.so
+%{_libdir}/pkgconfig/freeglut.pc
 %{_mandir}/man3/*
 
 %files demo