OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Aug-2003 14:37:18
Branch: HEAD Handle: 2003080813371701
Modified files:
openpkg-src/xaw3d xaw3d.spec
openpkg-web news.txt
Log:
force building of static library instead of cloning libXaw
installation, really pick up our compiler
Summary:
Revision Changes Path
1.23 +8 -3 openpkg-src/xaw3d/xaw3d.spec
1.6084 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xaw3d/xaw3d.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 xaw3d.spec
--- openpkg-src/xaw3d/xaw3d.spec 7 Aug 2003 13:15:11 -0000 1.22
+++ openpkg-src/xaw3d/xaw3d.spec 8 Aug 2003 12:37:18 -0000 1.23
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 1.5
-Release: 20030807
+Release: 20030808
# list of sources
Source0: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
@@ -56,6 +56,10 @@
%{l_shtool} subst \
-e 's;^\(#ifdef HAS_WCTYPE_H\)$;\1_DO_NOT_USE;' \
xc/lib/Xaw3d/XawI18n.h
+ %{l_shtool} subst \
+ -e 's;NormalLibXaw;YES;' \
+ -e 's;SharedLibXaw;NO;' \
+ xc/lib/Xaw3d/Imakefile
%build
cd xc/lib/Xaw3d/
@@ -65,9 +69,10 @@
# xmkmf -a
x11config=`%{l_prefix}/etc/rc --query x11_libdir`/X11/config
imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
- %{l_make} Makefiles
+ %{l_make} Makefiles IMAKE_DEFINES="-DHasGcc2 -UHasSunC"
%{l_make} includes
- %{l_make} EXTRA_DEFINES="-DARROW_SCROLLBAR -DUSEGRAY" EXTRA_INCLUDES="-I."
+ %{l_make} CC="%{l_cc}" \
+ EXTRA_DEFINES="-DARROW_SCROLLBAR -DUSEGRAY" EXTRA_INCLUDES="-I."
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6083 -r1.6084 news.txt
--- openpkg-web/news.txt 8 Aug 2003 12:15:05 -0000 1.6083
+++ openpkg-web/news.txt 8 Aug 2003 12:37:17 -0000 1.6084
@@ -1,3 +1,4 @@
+08-Aug-2003: Upgraded package: P<xaw3d-1.5-20030808>
08-Aug-2003: Upgraded package: P<sgml-20030808-20030808>
08-Aug-2003: Upgraded package: P<geoip-1.2.1-20030808>
08-Aug-2003: Upgraded package: P<djbdns-1.05-20030808>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
