Merge 00450e96f1 into b6529a3ce3

Closes issue #80.

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fix-ci
 
   pull_request:
     branches:
@@ -31,6 +32,8 @@ jobs:
       run: brew install openssl && brew info openssl
     - name: Install XQuartz
       run: brew install xquartz --cask && brew info xquartz
+    - name: Install groff
+      run: brew install groff && brew info groff
     - name: Compile
       run: make -C GUI/xephem
     - name: Test

GUI/xephem/auxil/mpcorb2edb.pl

@@ -119,7 +119,7 @@ print "Creating $brtfn and $dimfn..\n";
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime;
 $year += 1900;
 $mon += 1;
-$from = "# Data is from ftp://cfa-ftp.harvard.edu/pub/MPCORB/MPCORB.DAT\n";
+$from = "# Data is from $MPCSITE/$MPCFTPDIR/$MPCFILE\n";
 $what = "# Generated by mpcorb2edb.pl $ver, (c) 2000 Elwood Downey\n";
 $when = "# Processed $year-$mon-$mday $hour:$min:$sec UTC\n";
 

GUI/xephem/fallbacks.c

@@ -744,11 +744,11 @@ String fallbacks[] = {
     "XEphem*WCS.y: 10",
     "XEphem*WebDB*Pattern.value: ",
     "XEphem*WebDB*Search.set: False",
-    "XEphem*WebDB*URL0.value: http://celestrak.org/NORAD/elements/stations.txt",
+    "XEphem*WebDB*URL0.value: https://celestrak.org/NORAD/elements/stations.txt",
-    "XEphem*WebDB*URL1.value: http://celestrak.org/NORAD/elements/science.txt",
+    "XEphem*WebDB*URL1.value: https://celestrak.org/NORAD/elements/science.txt",
-    "XEphem*WebDB*URL2.value: http://celestrak.org/NORAD/elements/tle-new.txt",
+    "XEphem*WebDB*URL2.value: https://celestrak.org/NORAD/elements/tle-new.txt",
-    "XEphem*WebDB*URL3.value: http://celestrak.org/NORAD/elements/amateur.txt",
+    "XEphem*WebDB*URL3.value: https://celestrak.org/NORAD/elements/amateur.txt",
-    "XEphem*WebDB*URL4.value: http://celestrak.org/NORAD/elements/visual.txt",
+    "XEphem*WebDB*URL4.value: https://celestrak.org/NORAD/elements/visual.txt",
     "XEphem*WebDB*URL5.value: https://www.minorplanetcenter.net/iau/Ephemerides/Comets/Soft03Cmt.txt",
     "XEphem*WebDB*URL6.value: https://www.minorplanetcenter.net/iau/Ephemerides/CritList/Soft03CritList.txt",
     "XEphem*WebDB*URL7.value: https://www.minorplanetcenter.net/iau/Ephemerides/Distant/Soft03Distant.txt",

GUI/xephem/help/xephem.html

@@ -7991,7 +7991,7 @@ format if it is not already.<br>
 <br>
 Several particularly useful sites as of this build are already entered.
 The first five are from Dr. TS Kelso's Earth satellite lists at <a
- href="https://www.celestrak.org">celestrak.org</a>. The other four are
+ href="https://celestrak.org">celestrak.org</a>. The other four are
 the Minor Planet Center's lists of hot comets and unusual asteroids
 specially formatted for <a
  href="https://www.minorplanetcenter.net/iau/Ephemerides/Soft03.html">XEphem</a>.
@@ -7999,12 +7999,9 @@ Click <span style="font-weight: bold;">Get</span> beside the desired
 catalog to download the file to the Private directory and
 simultaneously load into XEphem memory.<br>
 <br>
-Special files created by
+Special files created by the <a
-<!-- could not found the correct linke
+ href="https://www.minorplanetcenter.net/data/">Minor Planet Center</a>
-<a href="http://cfa-www.harvard.edu/cfa/ps/mpc.html">Minor Planet Center</a>
+and <a href="https://asteroid.lowell.edu/astorb/">Lowell
-and
--->
-the <a href="https://asteroid.lowell.edu/">Lowell
 Observatory</a> may also be downloaded.
 Each organization maintains
 extensive lists of all known asteroids and produces on a regular basis

GUI/xephem/patchlevel.c

@@ -5,5 +5,5 @@
 #include "xephem.h"
 
 char PATCHLEVEL[] = "4.2.0";
-char PATCHDATE[] = "2021 September 13";
+char PATCHDATE[] = "2024 February 13";
 char COPYRIGHT[] = "Copyright (c) 1990-2021 by Elwood Charles Downey";

GUI/xephem/webdbmenu.c

@@ -158,7 +158,7 @@ wdb_create()
 	    XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
 	    tf_w = XmCreateTextField (f_w, buf, args, n);
 	    defaultTextFN (tf_w, 1, "", NULL);
-	    wtip (tf_w, "URL of file to download (must use HTTP)");
+	    wtip (tf_w, "URL of file to download (must use HTTP or HTTPS)");
 	    XtManageChild (tf_w);
 	    sprintf (buf, "XEphem*WebDB*URL%d.value", i);
 	    sr_reg (tf_w, buf, wdbcategory, 1);

GUI/xephem/xephem.man

@@ -1,9 +1,9 @@
-.TH XEphem 1X
+.TH XEPHEM 1 "Feb 2024"
-.SH Name
+.SH NAME
 XEphem \- an interactive astronomical ephemeris for X11
-.SH Syntax
+.SH SYNOPSIS
-\fBxephem [-prfb] [-install {yes|no|guess}] [-resfile <resourcefile>] [-[no]splash]\fP
+\fBxephem [\-prfb] [\-install {yes|no|guess}] [\-resfile <resourcefile>] [\-[no]splash]\fP
-.SH Description
+.SH DESCRIPTION
 .na
 .nh
 .PP
@@ -144,14 +144,14 @@ multi-user installations. XEphem looks here for support files. Unless
 defined otherwise, the Shared directory is ".", that is, the current 
 directory.
 
-.SH Author
+.SH AUTHOR
 .PP
 Elwood C. Downey, email ecdowney@ClearSkyInstitute.com.
 
-.SH References
+.SH SEE ALSO
 .PP
 The Web homepage, including the FAQ, is maintained at
-.I http://www.clearskyinstitute.com/xephem
+.I https://xephem.github.io/XEphem/Site/xephem.html
 .PP
 The online Help entry
 .I on Credits

system_integration/Linux/share/applications/io.github.xephem.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.4
+Type=Application
+Name=XEphem
+GenericName=Astronomical ephemeris calculator
+Exec=xephem
+Icon=XEphem
+Terminal=false
+Categories=Science;Astronomy

xephem.spec

@@ -36,13 +36,23 @@ gzip -c %{name}.man > %{name}.1x.gz
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_mandir}/man1x/
 
-cd GUI/xephem
+pushd GUI/xephem
 install -m 0755 %{name} %{buildroot}/%{_bindir}
 install -m 0444 %{name}.1x.gz %{buildroot}/%{_mandir}/man1x/
+popd
+
+# Provide a desktop entry
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 system_integration/Linux/share/applications/io.github.%{name}.desktop %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
+install -m 0644 GUI/xephem/XEphem.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
+
 
 %files
 %{_bindir}/%{name}
 %{_mandir}/man1x/%{name}.1x.gz
+%{_datadir}/applications/io.github.%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/XEphem.png
 
 %changelog
 * Fri Mar 05 2021 Douglas Needham <cinnion+github@gmail.com> 4.0.1-1