packages: xplanet/xplanet-gcc43.patch, xplanet/xplanet.spec - up to 1.2.1
arekm
arekm at pld-linux.org
Tue Jul 14 22:29:59 CEST 2009
Author: arekm Date: Tue Jul 14 20:29:59 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.2.1
---- Files affected:
packages/xplanet:
xplanet-gcc43.patch (1.1 -> 1.2) , xplanet.spec (1.28 -> 1.29)
---- Diffs:
================================================================
Index: packages/xplanet/xplanet-gcc43.patch
diff -u packages/xplanet/xplanet-gcc43.patch:1.1 packages/xplanet/xplanet-gcc43.patch:1.2
--- packages/xplanet/xplanet-gcc43.patch:1.1 Sun Aug 17 18:49:57 2008
+++ packages/xplanet/xplanet-gcc43.patch Tue Jul 14 22:29:54 2009
@@ -1,88 +1,113 @@
---- xplanet-1.2.0.orig/src/buildPlanetMap.cpp 2004-04-20 23:47:21.000000000 +0200
-+++ xplanet-1.2.0/src/buildPlanetMap.cpp 2008-08-17 18:40:45.197727542 +0200
-@@ -1,5 +1,6 @@
- #include <cmath>
- #include <cstdio>
-+#include <cstdlib>
+diff -ur xplanet-1.2.0.orig/src/libannotate/addArcs.cpp xplanet-1.2.0/src/libannotate/addArcs.cpp
+--- xplanet-1.2.0.orig/src/libannotate/addArcs.cpp 2005-03-15 19:27:13.000000000 +0100
++++ xplanet-1.2.0/src/libannotate/addArcs.cpp 2008-03-20 15:44:58.000000000 +0100
+@@ -3,7 +3,7 @@
+ #include <fstream>
+ #include <sstream>
#include <map>
+-#include <string>
++#include <cstring>
+ #include <vector>
using namespace std;
+diff -ur xplanet-1.2.0.orig/src/libannotate/addMarkers.cpp xplanet-1.2.0/src/libannotate/addMarkers.cpp
+--- xplanet-1.2.0.orig/src/libannotate/addMarkers.cpp 2004-08-29 22:41:58.000000000 +0200
++++ xplanet-1.2.0/src/libannotate/addMarkers.cpp 2008-03-20 15:45:11.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include <fstream>
+ #include <map>
+ #include <sstream>
+-#include <string>
++#include <cstring>
+ #include <vector>
+ using namespace std;
+
+diff -ur xplanet-1.2.0.orig/src/libannotate/addSatellites.cpp xplanet-1.2.0/src/libannotate/addSatellites.cpp
+--- xplanet-1.2.0.orig/src/libannotate/addSatellites.cpp 2004-07-23 02:46:20.000000000 +0200
++++ xplanet-1.2.0/src/libannotate/addSatellites.cpp 2008-03-20 15:45:23.000000000 +0100
+@@ -4,7 +4,7 @@
+ #include <fstream>
+ #include <map>
+ #include <sstream>
+-#include <string>
++#include <cstring>
+ #include <vector>
+ using namespace std;
+
+diff -ur xplanet-1.2.0.orig/src/libannotate/Icon.cpp xplanet-1.2.0/src/libannotate/Icon.cpp
--- xplanet-1.2.0.orig/src/libannotate/Icon.cpp 2004-02-16 19:36:42.000000000 +0100
-+++ xplanet-1.2.0/src/libannotate/Icon.cpp 2008-08-17 18:38:41.957195576 +0200
++++ xplanet-1.2.0/src/libannotate/Icon.cpp 2008-03-20 15:45:58.000000000 +0100
@@ -1,4 +1,5 @@
#include <sstream>
+#include <cstring>
using namespace std;
#include "findFile.h"
+diff -ur xplanet-1.2.0.orig/src/libplanet/Planet.cpp xplanet-1.2.0/src/libplanet/Planet.cpp
--- xplanet-1.2.0.orig/src/libplanet/Planet.cpp 2005-06-14 20:04:05.000000000 +0200
-+++ xplanet-1.2.0/src/libplanet/Planet.cpp 2008-08-17 18:39:06.110739788 +0200
-@@ -3,6 +3,7 @@
++++ xplanet-1.2.0/src/libplanet/Planet.cpp 2008-03-20 15:46:53.000000000 +0100
+@@ -2,7 +2,7 @@
+ #include <cstdio>
#include <cctype>
#include <sstream>
- #include <string>
+-#include <string>
+#include <cstring>
using namespace std;
#include "findFile.h"
+diff -ur xplanet-1.2.0.orig/src/libprojection/getProjection.cpp xplanet-1.2.0/src/libprojection/getProjection.cpp
--- xplanet-1.2.0.orig/src/libprojection/getProjection.cpp 2005-06-13 17:13:11.000000000 +0200
-+++ xplanet-1.2.0/src/libprojection/getProjection.cpp 2008-08-17 18:39:34.897190591 +0200
-@@ -2,6 +2,7 @@
++++ xplanet-1.2.0/src/libprojection/getProjection.cpp 2008-03-20 15:47:34.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <cctype>
#include <cstring>
++#include <cstdlib>
#include <sstream>
#include <vector>
-+#include <cstdlib>
using namespace std;
-
- #include "keywords.h"
+diff -ur xplanet-1.2.0.orig/src/Map.cpp xplanet-1.2.0/src/Map.cpp
--- xplanet-1.2.0.orig/src/Map.cpp 2005-06-15 01:40:46.000000000 +0200
-+++ xplanet-1.2.0/src/Map.cpp 2008-08-17 18:40:24.051143441 +0200
-@@ -1,6 +1,8 @@
++++ xplanet-1.2.0/src/Map.cpp 2008-03-20 15:48:01.000000000 +0100
+@@ -1,5 +1,6 @@
#include <map>
#include <sstream>
- #include <string>
-+#include <cmath>
+#include <cstdlib>
+ #include <string>
using namespace std;
- #include "Map.h"
+diff -ur xplanet-1.2.0.orig/src/parseColor.cpp xplanet-1.2.0/src/parseColor.cpp
--- xplanet-1.2.0.orig/src/parseColor.cpp 2004-11-23 18:49:48.000000000 +0100
-+++ xplanet-1.2.0/src/parseColor.cpp 2008-08-17 18:41:05.847741802 +0200
-@@ -3,6 +3,8 @@
++++ xplanet-1.2.0/src/parseColor.cpp 2008-03-20 15:49:23.000000000 +0100
+@@ -2,7 +2,8 @@
+ #include <fstream>
#include <map>
#include <sstream>
- #include <string>
+-#include <string>
+#include <cstring>
+#include <cstdlib>
using namespace std;
#include "findFile.h"
+diff -ur xplanet-1.2.0.orig/src/PlanetProperties.h xplanet-1.2.0/src/PlanetProperties.h
--- xplanet-1.2.0.orig/src/PlanetProperties.h 2005-04-02 02:43:06.000000000 +0200
-+++ xplanet-1.2.0/src/PlanetProperties.h 2008-08-17 18:37:52.727825002 +0200
-@@ -2,6 +2,7 @@
++++ xplanet-1.2.0/src/PlanetProperties.h 2008-03-20 15:46:16.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef PLANETPROPERTIES_H
#define PLANETPROPERTIES_H
- #include <string>
+-#include <string>
+#include <cstring>
#include <vector>
#include "body.h"
---- xplanet-1.2.0.orig/src/xplanet.cpp 2004-09-09 17:46:05.000000000 +0200
-+++ xplanet-1.2.0/src/xplanet.cpp 2008-08-17 18:41:37.707177882 +0200
-@@ -4,6 +4,7 @@
- #include <map>
- #include <sstream>
- #include <vector>
-+#include <cstdlib>
- using namespace std;
-
- #include <sys/time.h>
+diff -ur xplanet-1.2.0.orig/src/xpUtil.cpp xplanet-1.2.0/src/xpUtil.cpp
--- xplanet-1.2.0.orig/src/xpUtil.cpp 2005-04-02 02:22:51.000000000 +0200
-+++ xplanet-1.2.0/src/xpUtil.cpp 2008-08-17 18:41:25.044053781 +0200
-@@ -6,6 +6,8 @@
++++ xplanet-1.2.0/src/xpUtil.cpp 2008-03-20 15:50:06.000000000 +0100
+@@ -5,7 +5,8 @@
+ #include <ctime>
#include <iostream>
#include <sstream>
- #include <string>
+-#include <string>
+#include <cstring>
+#include <cstdlib>
using namespace std;
================================================================
Index: packages/xplanet/xplanet.spec
diff -u packages/xplanet/xplanet.spec:1.28 packages/xplanet/xplanet.spec:1.29
--- packages/xplanet/xplanet.spec:1.28 Sun Jul 12 15:31:21 2009
+++ packages/xplanet/xplanet.spec Tue Jul 14 22:29:54 2009
@@ -2,12 +2,12 @@
Summary: Render a planetary image into an X window
Summary(pl.UTF-8): Renderuje obrazek planety w okienku X window
Name: xplanet
-Version: 1.2.0
-Release: 5
+Version: 1.2.1
+Release: 1
License: GPL
Group: X11/Amusements
Source0: http://dl.sourceforge.net/xplanet/%{name}-%{version}.tar.gz
-# Source0-md5: 87d62fcdf43ad1beec677bfb6e299ac1
+# Source0-md5: 5dca0369ca64fa3c006b616b72b5e1cf
Patch0: %{name}-gcc43.patch
URL: http://xplanet.sourceforge.net/
BuildRequires: OpenGL-devel
@@ -75,6 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2009/07/14 20:29:54 arekm
+- up to 1.2.1
+
Revision 1.28 2009/07/12 13:31:21 arekm
- release 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xplanet/xplanet-gcc43.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xplanet/xplanet.spec?r1=1.28&r2=1.29&f=u
More information about the pld-cvs-commit
mailing list