packages: xephem/xephem-makefile.patch, xephem/xephem.spec, xephem/xephem-x...

[gotar]

Author: gotar                        Date: Wed Aug 25 14:53:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 3.7.4

---- Files affected:
packages/xephem:
   xephem-makefile.patch (1.2 -> 1.3) , xephem.spec (1.53 -> 1.54) , xephem-xephemdbd.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xephem/xephem-makefile.patch
diff -u packages/xephem/xephem-makefile.patch:1.2 packages/xephem/xephem-makefile.patch:1.3
--- packages/xephem/xephem-makefile.patch:1.2	Thu Aug 30 14:53:34 2007
+++ packages/xephem/xephem-makefile.patch	Wed Aug 25 16:53:47 2010
@@ -1,9 +1,9 @@
 --- 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
@@ -11,8 +11,8 @@
  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
@@ -23,7 +23,7 @@
  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
@@ -31,4 +31,4 @@
 -	cd ../../libz; make
  
  clean:
- 	touch x.o
+ 	rm -fr *.o ../../lib*/*.[ao]

================================================================
Index: packages/xephem/xephem.spec
diff -u packages/xephem/xephem.spec:1.53 packages/xephem/xephem.spec:1.54
--- packages/xephem/xephem.spec:1.53	Sun Jan 31 01:26:00 2010
+++ packages/xephem/xephem.spec	Wed Aug 25 16:53:47 2010
@@ -3,21 +3,21 @@
 # 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
@@ -69,7 +69,6 @@
 %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
@@ -199,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2010/08/25 14:53:47  gotar
+- upgraded to 3.7.4
+
 Revision 1.53  2010/01/31 00:26:00  sparky
 - BR: libpng-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xephem/xephem-makefile.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xephem/xephem.spec?r1=1.53&r2=1.54&f=u