rpms/xplanet/F-10 xplanet-1.2.1-g++44.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xplanet.spec, 1.16, 1.17 xplanet-1.2.0-g++43-missing-header.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602/xplanet/F-10

Modified Files:
	.cvsignore sources xplanet.spec 
Added Files:
	xplanet-1.2.1-g++44.patch 
Removed Files:
	xplanet-1.2.0-g++43-missing-header.patch 
Log Message:
update

xplanet-1.2.1-g++44.patch:

--- NEW FILE xplanet-1.2.1-g++44.patch ---
--- xplanet-1.2.1/src/Satellite.cpp.g++44	2006-03-26 09:34:21.000000000 +0900
+++ xplanet-1.2.1/src/Satellite.cpp	2009-04-23 01:45:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include <clocale>
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 using namespace std;
--- xplanet-1.2.1/src/Separation.cpp.g++44	2008-11-14 09:19:05.000000000 +0900
+++ xplanet-1.2.1/src/Separation.cpp	2009-04-23 01:46:37.000000000 +0900
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <iostream>
+#include <cstdio>
 
 #include "Separation.h"
 #include "View.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 15:41:40 -0000	1.3
+++ .cvsignore	22 Apr 2009 17:28:28 -0000	1.4
@@ -1 +1 @@
-xplanet-1.2.0.tar.gz
+xplanet-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:41:40 -0000	1.3
+++ sources	22 Apr 2009 17:28:28 -0000	1.4
@@ -1 +1 @@
-87d62fcdf43ad1beec677bfb6e299ac1  xplanet-1.2.0.tar.gz
+5dca0369ca64fa3c006b616b72b5e1cf  xplanet-1.2.1.tar.gz


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/F-10/xplanet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xplanet.spec	9 Feb 2008 04:22:47 -0000	1.16
+++ xplanet.spec	22 Apr 2009 17:28:29 -0000	1.17
@@ -1,12 +1,12 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
-Version:	1.2.0
-Release:	3%{?dist}.2
+Version:	1.2.1
+Release:	1%{?dist}
 
 License:	GPLv2
 Group:		Amusements/Graphics
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		xplanet-1.2.0-g++43-missing-header.patch
+Patch0:		xplanet-1.2.1-g++44.patch
 URL:		http://%{name}.sourceforge.net
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,9 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	pango-devel
+%if 0%{?fedora} >= 11
+Requires:	gnu-free-mono-fonts
+%endif
 
 %description
 Xplanet is similar to Xearth, where an image of the earth is rendered
@@ -31,16 +34,21 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+%patch0 -p1 -b .g++
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} -k
 
 %install
 rm -rf %{buildroot}
 CPPROG="cp -p" make DESTDIR=%{buildroot} install
 
+%if 0%{?fedora} >=11
+ln -sf ../fonts/gnu-free/FreeMonoBold.ttf \
+	%{buildroot}%{_datadir}/%{name}/FreeMonoBold.ttf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -52,6 +60,21 @@
 %{_datadir}/xplanet
 
 %changelog
+* Thu Apr 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
+* Wed Mar 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-7
+- GNU FreeFont naming change
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-6
+- F-11: Mass rebuild
+
+* Thu Feb  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-5
+- Patch to compile with g++44
+
+* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
+- Remove xplanet private ttf file, use system one
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 


--- xplanet-1.2.0-g++43-missing-header.patch DELETED ---