--- xephem-3.7.1.orig/GUI/xephem/Makefile 2005-11-18 14:43:09.000000000 +0100
+++ xephem-3.7.1/GUI/xephem/Makefile 2006-07-22 18:28:04.305473250 +0200
@@ -10,8 +10,8 @@
- # back here and compile and link all the *.c files into one executable, xephem.
+ # one executable, xephem.
- # -I and -L flags to find required supporting XEphem libraries
+ # 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
+LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd
LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
# MOTIFI is the directory containing the Xm directory of include files.
-@@ -32,9 +32,9 @@
- # for linux and pure ppc Apple OS X
+@@ -34,9 +34,9 @@
+ # some systems now use just /usr/X11 (not /usr/X11R6)
CC = gcc
CLDFLAGS = -g
-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
LIBS = $(XLIBS) $(LIBLIB) -lm
# for ppc Apple OS X to make universal (i386 and ppc binary), requires
-@@ -189,8 +189,6 @@
+@@ -191,8 +191,6 @@
cd ../../libip; make
cd ../../libjpegd; make
cd ../../liblilxml; make
- cd ../../libz; make
clean:
- touch x.o
+ rm -fr *.o ../../lib*/*.[ao]
+++ /dev/null
---- GUI/xephem/tools/xephemdbd/request.c.orig 2007-08-30 14:26:29.000000000 +0200
-+++ GUI/xephem/tools/xephemdbd/request.c 2007-08-30 14:26:13.000000000 +0200
-@@ -155,7 +155,7 @@
- {
- char str1[32], str2[32];
-
-- fs_date (str1, mjd_day(mjd));
-+ fs_date (str1, pref_get(PREF_DATE_FORMAT), mjd_day(mjd));
- fs_sexa (str2, mjd_hr(mjd), 2, 3600);
- printf ("UTC Time: %s %s JD %13.5f\n", str1, str2, mjd+MJD0);
-
# TODO: Check INDI interface (anyone with telescope?), probably change
# fifo dir (/usr/share/xephem/fifo) as it needs to be writeable.
# And how it cooperates with http://indi.sf.net?
+# Consider using system-wide libjpeg instead of shipped libjpegd
#
Summary: Interactive astronomy program
Summary(pl.UTF-8): Interaktywny program astronomiczny
Name: xephem
-Version: 3.7.2
-Release: 3
+Version: 3.7.4
+Release: 1
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}.tar.gz
-# Source0-md5: 1074e04b9a89302d9f2bad7107674311
+Source0: http://97.74.56.125/free/%{name}-%{version}.tar.gz
+# Source0-md5: 4e9290609f36df469a2ba5a1b4fffd46
Source1: %{name}.desktop
Source2: %{name}.png
Source3: %{name}_sites
Patch0: %{name}-makefile.patch
-Patch1: %{name}-xephemdbd.patch
URL: http://www.clearskyinstitute.com/xephem/
BuildRequires: groff
BuildRequires: libpng-devel
%prep
%setup -q
%patch0 -p1
-%patch1 -p0
sed -i "s#X11R6/lib#X11R6/%{_lib}#g" GUI/xephem/Makefile
sed -i "s#/usr/local#%{_datadir}#g" GUI/xephem/tools/xephemdbd/start-xephemdbd.pl