- rediff patch, rebuild with openssl 3.0.0, rel 2

diff --git a/xephem-makefile.patch b/xephem-makefile.patch
index 63877197dd27f3b3cf479267a114092896597249..2b96b9169d62a1087d041095a019c09829ecf275 100644 (file)
--- a/xephem-makefile.patch
+++ b/xephem-makefile.patch
@@ -1,18 +1,20 @@
---- xephem-3.7.7/GUI/xephem/Makefile.orig      2015-08-09 23:36:50.000000000 +0200
-+++ xephem-3.7.7/GUI/xephem/Makefile   2018-12-19 21:10:25.456956449 +0100
-@@ -10,8 +10,8 @@
+diff -urNp -x '*.orig' xephem-3.7.7.org/GUI/xephem/Makefile xephem-3.7.7/GUI/xephem/Makefile
+--- xephem-3.7.7.org/GUI/xephem/Makefile       2021-10-03 10:45:25.604455606 +0200
++++ xephem-3.7.7/GUI/xephem/Makefile   2021-10-03 10:45:25.831118713 +0200
+@@ -10,9 +10,9 @@
  # one executable, xephem.
  
  # These -I and -L flags point to the supporting XEphem libraries
 -LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
 -LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
 +LIBINC = -I../../libastro -I../../libip -I../../liblilxml
 +LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
--LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
 +LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
  
  # MOTIFI is the directory containing the Xm directory of include files.
-@@ -32,7 +32,7 @@
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -32,7 +32,7 @@ endif
  # for linux and Apple OS X
  CC = gcc
  CLDFLAGS = -g
@@ -20,8 +22,10 @@
 +CFLAGS = $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I/opt/X11/include
  LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
  XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
-@@ -199,8 +199,5 @@
+ LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
+@@ -197,10 +197,7 @@ xephem.1: xephem.man
+ libs:
+       cd ../../libastro; make
        cd ../../libip; make
 -      cd ../../libjpegd; make
        cd ../../liblilxml; make

diff --git a/xephem.spec b/xephem.spec
index c2193e2d20f4b205c6a4006ccf12dbcd7b99d5d3..e5515c6f76440d29c04474399f5a76474177f2dc 100644 (file)
--- a/xephem.spec
+++ b/xephem.spec
@@ -7,7 +7,7 @@ Summary:        Interactive astronomy program
 Summary(pl.UTF-8):     Interaktywny program astronomiczny
 Name:          xephem
 Version:       3.7.7
-Release:       1
+Release:       2
 License:       distributable with free-unices distros, free for non-profit non-commercial purposes
 Group:         X11/Applications/Science
 Source0:       http://www.clearskyinstitute.com/xephem/%{name}-%{version}.tgz