SPECS: xephem.spec - reverted previous change, trying to fix amd64...

havner havner at pld-linux.org
Sat Jul 22 19:23:02 CEST 2006


Author: havner                       Date: Sat Jul 22 17:23:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted previous change, trying to fix amd64 build

---- Files affected:
SPECS:
   xephem.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/xephem.spec
diff -u SPECS/xephem.spec:1.34 SPECS/xephem.spec:1.35
--- SPECS/xephem.spec:1.34	Sat Jul 22 18:42:54 2006
+++ SPECS/xephem.spec	Sat Jul 22 19:22:57 2006
@@ -18,6 +18,7 @@
 URL:		http://www.clearskyinstitute.com/xephem/
 BuildRequires:	XFree86-devel
 BuildRequires:	openmotif-devel
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
@@ -71,6 +72,8 @@
 %setup -q
 %patch0 -p1
 
+sed -i "s#X11R6/lib#X11R6/%{_lib}#g" GUI/xephem/Makefile
+
 mv GUI/xephem/tools/lx200xed/README GUI/xephem/tools/lx200xed/README-lx
 mv GUI/xephem/tools/indi/README GUI/xephem/tools/indi/README-indi
 mv GUI/xephem/tools/xedb/README GUI/xephem/tools/xedb/README-xedb
@@ -82,7 +85,7 @@
 
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CDEBUGFLAGS="%{rpmcflags}"
 
 %{__make} -C tools/lx200xed \
 	CC="%{__cc}" \
@@ -164,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2006/07/22 17:22:57  havner
+- reverted previous change, trying to fix amd64 build
+
 Revision 1.34  2006/07/22 16:42:54  havner
 - pass rpm flags also for xephem binary
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xephem.spec?r1=1.34&r2=1.35&f=u



More information about the pld-cvs-commit mailing list