[skyviewer] rebuild for new cfitsio, build against libGLU

Tom Callaway spot at fedoraproject.org
Thu Apr 25 19:46:43 UTC 2013


commit a6438602db4597b7bf38ea476615f3abd451c3c9
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Apr 25 15:46:04 2013 -0400

    rebuild for new cfitsio, build against libGLU

 skyviewer-1.0.0-libGLU.patch |   12 ++++++++++++
 skyviewer.spec               |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/skyviewer-1.0.0-libGLU.patch b/skyviewer-1.0.0-libGLU.patch
new file mode 100644
index 0000000..42cb5d1
--- /dev/null
+++ b/skyviewer-1.0.0-libGLU.patch
@@ -0,0 +1,12 @@
+diff -up skyviewer-1.0.0/skyviewer.pro.GLU skyviewer-1.0.0/skyviewer.pro
+--- skyviewer-1.0.0/skyviewer.pro.GLU	2013-04-25 15:44:01.872896643 -0400
++++ skyviewer-1.0.0/skyviewer.pro	2013-04-25 15:44:06.164896708 -0400
+@@ -62,7 +62,7 @@ LANGUAGE = C++
+ TEMPLATE = app
+ CONFIG += release warn_on qt thread
+ CONFIG += thread
+-LIBS += -lcfitsio -lQGLViewer
++LIBS += -lcfitsio -lGLU -lQGLViewer
+ LIBS += -lchealpix
+ contains( QT_VERSION, "^4\..*" ){
+   QT *= xml opengl
diff --git a/skyviewer.spec b/skyviewer.spec
index 8fd98f7..9ca390d 100644
--- a/skyviewer.spec
+++ b/skyviewer.spec
@@ -1,6 +1,6 @@
 Name:           skyviewer
 Version:        1.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Program to display HEALPix-based skymaps in FITS files
 
 Group:          Amusements/Graphics
@@ -10,6 +10,7 @@ Source0:        http://lambda.gsfc.nasa.gov/toolbox/skyviewer/%{name}-%{version}
 Source1:        skyviewer.desktop
 # Will be included in the next release
 Source2:        skyviewer-license.txt
+Patch0:		skyviewer-1.0.0-libGLU.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
@@ -17,6 +18,7 @@ BuildRequires:  chealpix-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libQGLViewer-devel
 BuildRequires:  qt4-devel
+BuildRequires:	mesa-libGLU-devel
 
 %description
 SkyViewer is an OpenGL based program to display HEALPix-based skymaps,
@@ -28,6 +30,7 @@ assuming you have a strong enough graphics card.
 
 %prep
 %setup -q
+%patch0 -p1 -b .GLU
 install -pm 0644 %{SOURCE2} LICENSE
 
 
@@ -76,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 25 2013 Tom Callaway <spot at fedoraproject.org> - 1.0.0-12
+- rebuild for new cfitsio
+- fix ftbfs, link to libGLU
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list