Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xplanet for openSUSE:Factory checked in at 2023-04-27 20:00:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplanet (Old) and /work/SRC/openSUSE:Factory/.xplanet.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xplanet" Thu Apr 27 20:00:40 2023 rev:18 rq:1083074 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xplanet/xplanet.changes 2021-01-25 18:23:59.608461182 +0100 +++ /work/SRC/openSUSE:Factory/.xplanet.new.1533/xplanet.changes 2023-04-27 20:01:00.225949960 +0200 @@ -1,0 +2,6 @@ +Wed Apr 26 10:02:28 UTC 2023 - Jan Engelhardt <[email protected]> + +- Remove pre-SUSE-15 build logic +- Refersh gcc6.patch from -p0 to -p1 to match the rest + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplanet.spec ++++++ --- /var/tmp/diff_new_pack.FpwySM/_old 2023-04-27 20:01:00.773953182 +0200 +++ /var/tmp/diff_new_pack.FpwySM/_new 2023-04-27 20:01:00.777953205 +0200 @@ -1,7 +1,7 @@ # # spec file for package xplanet # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -47,15 +47,9 @@ %else BuildRequires: netpbm-devel %endif -%if 0%{?suse_version} == 1110 -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libICE-devel -#BuildRequires: XScrnSaver-devel -%else BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) -%endif %description Xplanet can display the earth or other planets in the background of @@ -65,12 +59,7 @@ satellite cloud images. %prep -%setup -q -%if 0%{?suse_version} > 1320 -%patch0 -p1 -%endif -%patch1 -%patch2 -p1 +%autosetup -p1 cp -a %{S:2} . %build @@ -81,7 +70,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing" %configure -make %{?_smp_mflags} +%make_build %install %make_install ++++++ gcc6.patch ++++++ --- /var/tmp/diff_new_pack.FpwySM/_old 2023-04-27 20:01:00.801953346 +0200 +++ /var/tmp/diff_new_pack.FpwySM/_new 2023-04-27 20:01:00.801953346 +0200 @@ -1,65 +1,18 @@ -Index: src/libmultiple/RayleighScattering.cpp -=================================================================== ---- src/libmultiple/RayleighScattering.cpp (revision 206) -+++ src/libmultiple/RayleighScattering.cpp (revision 207) -@@ -369,7 +369,7 @@ - - diskTemplate_.clear(); - limbTemplate_.clear(); -- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) -+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) - { - int i = 0; - while (isDelimiter(line[i])) -@@ -439,7 +439,7 @@ - values.clear(); - - char line[MAX_LINE_LENGTH]; -- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) -+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) - { - int i = 0; - while (isDelimiter(line[i])) -@@ -470,7 +470,7 @@ - double &value) - { - char line[MAX_LINE_LENGTH]; -- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) -+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) - { - int i = 0; - while (isDelimiter(line[i])) -Index: src/libmultiple/drawStars.cpp -=================================================================== ---- src/libmultiple/drawStars.cpp (revision 206) -+++ src/libmultiple/drawStars.cpp (revision 207) -@@ -41,7 +41,7 @@ - ifstream inFile(starMap.c_str()); - - char line[MAX_LINE_LENGTH]; -- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) -+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) - { - if (line[0] == '#') continue; - -Index: src/readConfig.cpp -=================================================================== ---- src/readConfig.cpp (revision 206) -+++ src/readConfig.cpp (revision 207) -@@ -550,7 +550,7 @@ - - ifstream inFile(configFile.c_str()); - char *line = new char[256]; -- while (inFile.getline(line, 256, '\n') != NULL) -+ while (inFile.getline(line, 256, '\n')) - readConfig(line, planetProperties); - - // This condition will only be true if [default] is the only -Index: src/libannotate/addArcs.cpp +--- + src/libannotate/addArcs.cpp | 4 ++-- + src/libannotate/addMarkers.cpp | 4 ++-- + src/libannotate/addSatellites.cpp | 8 ++++---- + src/libannotate/addSpiceObjects.cpp | 4 ++-- + src/libmultiple/RayleighScattering.cpp | 6 +++--- + src/libmultiple/drawStars.cpp | 2 +- + src/readConfig.cpp | 2 +- + 7 files changed, 15 insertions(+), 15 deletions(-) + +Index: xplanet-1.3.1/src/libannotate/addArcs.cpp =================================================================== ---- src/libannotate/addArcs.cpp (revision 206) -+++ src/libannotate/addArcs.cpp (revision 207) -@@ -258,7 +258,7 @@ +--- xplanet-1.3.1.orig/src/libannotate/addArcs.cpp ++++ xplanet-1.3.1/src/libannotate/addArcs.cpp +@@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperti { ifstream inFile(arcFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -68,7 +21,7 @@ readArcFile(line, planet, view, projection, planetProperties, annotationMap); -@@ -292,7 +292,7 @@ +@@ -292,7 +292,7 @@ addArcs(View *view, multimap<double, Ann { ifstream inFile(arcFile.c_str()); char *line = new char[256]; @@ -77,11 +30,11 @@ readArcFile(line, NULL, view, NULL, NULL, annotationMap); inFile.close(); -Index: src/libannotate/addMarkers.cpp +Index: xplanet-1.3.1/src/libannotate/addMarkers.cpp =================================================================== ---- src/libannotate/addMarkers.cpp (revision 206) -+++ src/libannotate/addMarkers.cpp (revision 207) -@@ -429,7 +429,7 @@ +--- xplanet-1.3.1.orig/src/libannotate/addMarkers.cpp ++++ xplanet-1.3.1/src/libannotate/addMarkers.cpp +@@ -429,7 +429,7 @@ addMarkers(PlanetProperties *planetPrope { ifstream inFile(markerFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -90,7 +43,7 @@ { unsigned char color[3]; memcpy(color, planetProperties->MarkerColor(), 3); -@@ -475,7 +475,7 @@ +@@ -475,7 +475,7 @@ addMarkers(View *view, const int width, { ifstream inFile(markerFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -99,11 +52,11 @@ { unsigned char color[3]; memcpy(color, options->Color(), 3); -Index: src/libannotate/addSatellites.cpp +Index: xplanet-1.3.1/src/libannotate/addSatellites.cpp =================================================================== ---- src/libannotate/addSatellites.cpp (revision 206) -+++ src/libannotate/addSatellites.cpp (revision 207) -@@ -488,10 +488,10 @@ +--- xplanet-1.3.1.orig/src/libannotate/addSatellites.cpp ++++ xplanet-1.3.1/src/libannotate/addSatellites.cpp +@@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *pl { ifstream inFile(tleFile.c_str()); char lines[3][80]; @@ -117,7 +70,7 @@ { ostringstream errStr; errStr << "Malformed TLE file (" << tleFile << ")?\n"; -@@ -542,7 +542,7 @@ +@@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetPr { ifstream inFile(satFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -126,11 +79,11 @@ readSatelliteFile(line, planet, view, projection, planetProperties, annotationMap); -Index: src/libannotate/addSpiceObjects.cpp +Index: xplanet-1.3.1/src/libannotate/addSpiceObjects.cpp =================================================================== ---- src/libannotate/addSpiceObjects.cpp (revision 206) -+++ src/libannotate/addSpiceObjects.cpp (revision 207) -@@ -524,7 +524,7 @@ +--- xplanet-1.3.1.orig/src/libannotate/addSpiceObjects.cpp ++++ xplanet-1.3.1/src/libannotate/addSpiceObjects.cpp +@@ -524,7 +524,7 @@ processSpiceKernels(const bool load) { ifstream inFile(kernelFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -139,7 +92,7 @@ { int ii = 0; while (isDelimiter(line[ii])) -@@ -576,7 +576,7 @@ +@@ -576,7 +576,7 @@ addSpiceObjects(map<double, Planet *> &p { ifstream inFile(spiceFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; @@ -148,4 +101,61 @@ readSpiceFile(line, planetsFromSunMap, view, projection, annotationMap); inFile.close(); +Index: xplanet-1.3.1/src/libmultiple/RayleighScattering.cpp +=================================================================== +--- xplanet-1.3.1.orig/src/libmultiple/RayleighScattering.cpp ++++ xplanet-1.3.1/src/libmultiple/RayleighScattering.cpp +@@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(strin + + diskTemplate_.clear(); + limbTemplate_.clear(); +- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) ++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) + { + int i = 0; + while (isDelimiter(line[i])) +@@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream & + values.clear(); + + char line[MAX_LINE_LENGTH]; +- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) ++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) + { + int i = 0; + while (isDelimiter(line[i])) +@@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream & + double &value) + { + char line[MAX_LINE_LENGTH]; +- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) ++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) + { + int i = 0; + while (isDelimiter(line[i])) +Index: xplanet-1.3.1/src/libmultiple/drawStars.cpp +=================================================================== +--- xplanet-1.3.1.orig/src/libmultiple/drawStars.cpp ++++ xplanet-1.3.1/src/libmultiple/drawStars.cpp +@@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *vi + ifstream inFile(starMap.c_str()); + + char line[MAX_LINE_LENGTH]; +- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) ++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) + { + if (line[0] == '#') continue; + +Index: xplanet-1.3.1/src/readConfig.cpp +=================================================================== +--- xplanet-1.3.1.orig/src/readConfig.cpp ++++ xplanet-1.3.1/src/readConfig.cpp +@@ -550,7 +550,7 @@ readConfigFile(string configFile, Planet + + ifstream inFile(configFile.c_str()); + char *line = new char[256]; +- while (inFile.getline(line, 256, '\n') != NULL) ++ while (inFile.getline(line, 256, '\n')) + readConfig(line, planetProperties); + + // This condition will only be true if [default] is the only
