rpms/celestia/devel celestia-1.4.0-compile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 celestia.spec, 1.13, 1.14 sources, 1.4, 1.5

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32110

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.4.0-compile.patch 
Log Message:
Update to CVS snapshot to fix various compile issues.

celestia-1.4.0-compile.patch:

--- NEW FILE celestia-1.4.0-compile.patch ---
--- src/celengine/star.h.orig	2005-12-06 11:30:23.000000000 -0600
+++ src/celengine/star.h	2006-02-10 15:21:49.000000000 -0600
@@ -30,7 +30,7 @@
     // orbits and StarDetails objects.  Currently, it's assumed that they
     // have lifetimes that continue until program termination.
  public:
-    StarDetails::StarDetails();
+    StarDetails();
 
     inline float getRadius() const;
     inline float getTemperature() const;
--- src/celengine/command.h.orig	2004-12-22 16:07:15.000000000 -0600
+++ src/celengine/command.h	2006-02-10 18:46:25.000000000 -0600
@@ -94,10 +94,10 @@
 class CommandGotoLongLat : public InstantaneousCommand
 {
  public:
-    CommandGotoLongLat::CommandGotoLongLat(double t,
-                                           double dist,
-                                           float _longitude, float _latitude,
-                                           Vec3f _up);
+    CommandGotoLongLat(double t,
+                       double dist,
+                       float _longitude, float _latitude,
+                       Vec3f _up);
     ~CommandGotoLongLat();
     void process(ExecutionEnvironment&);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2005 22:50:48 -0000	1.4
+++ .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
@@ -1 +1 @@
-celestia-1.4.0.tar.gz
+celestia-1.4.0.20060210cvs.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- celestia.spec	21 Jan 2006 01:09:26 -0000	1.13
+++ celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
@@ -1,13 +1,15 @@
 Name:           celestia
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.0.20060210cvs
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
+#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
+Source0:        celestia-%{version}.tar.gz
 Source3:        celestia.desktop
+Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,6 +22,9 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
+# For the CVS snapshot.
+BuildRequires:  gettext-devel
+
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -39,9 +44,11 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
+make -f Makefile.cvs
+
 export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
 %configure --with-gnome
 make %{?_smp_mflags}
@@ -58,7 +65,7 @@
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
 rm $RPM_BUILD_ROOT%{_datadir}/celestia/{controls.txt,COPYING}
 ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/
-rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
+#rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
 
 rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
 
@@ -90,7 +97,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
+%doc AUTHORS ChangeLog COPYING README TODO controls.txt
+# Seem to have gone away in post-1.4.0 CVS...
+#%doc manual/*.html manual/*.css
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
@@ -99,6 +108,12 @@
 
 
 %changelog
+* Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0.20060210cvs-1
+- Update to today's CVS snapshot
+
+* Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0-3
+- Add celestia-1.4.0-compile.patch to fix a bug when compiling with g++ 4.1
+
 * Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
 - Add BR: libGLU-devel, libXt-devel, libXmu-devel
 - Add -lpangox-1.0 to GTK_LIBS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Dec 2005 22:50:48 -0000	1.4
+++ sources	11 Feb 2006 18:59:50 -0000	1.5
@@ -1 +1 @@
-d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz
+3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz