rpms/celestia/FC-4 celestia-1.4.0-compile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 celestia.spec, 1.9, 1.10 sources, 1.4, 1.5

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/celestia/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23490

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.4.0-compile.patch 
Log Message:
Sync with devel branch (mostly).

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/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2005 23:51:51 -0000	1.4
+++ .cvsignore	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-celestia-1.4.0.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- celestia.spec	26 Dec 2005 23:51:51 -0000	1.9
+++ celestia.spec	9 Apr 2006 01:39:12 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           celestia
-Version:        1.4.0
-Release:        1%{?dist}
-
+Version:        1.4.1
+Release:        0.1%{?dist}
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
 Source0:        http://dl.sf.net/celestia/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)
 
@@ -17,7 +16,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -37,9 +36,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -55,7 +55,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
 
@@ -87,7 +87,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
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 1.4.1-0.1
+- Sync with devel branch (mostly)
+
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0
 - Remove celestia-1.3.2-compile.patch (seems to be applied upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Dec 2005 23:51:51 -0000	1.4
+++ sources	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz