OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Apr-2003 17:33:26
Branch: HEAD Handle: 2003040516332401
Modified files:
openpkg-src/xaw3d xaw3d.spec
openpkg-web news.txt
Log:
Force use of binutils ld command, removing the incompatible mapfile
flag if it exists. Also, manually build the static library if only a
shared one was built.
Summary:
Revision Changes Path
1.9 +10 -3 openpkg-src/xaw3d/xaw3d.spec
1.3968 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xaw3d/xaw3d.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 xaw3d.spec
--- openpkg-src/xaw3d/xaw3d.spec 12 Mar 2003 12:59:03 -0000 1.8
+++ openpkg-src/xaw3d/xaw3d.spec 5 Apr 2003 15:33:25 -0000 1.9
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 1.5
-Release: 20030312
+Release: 20030405
# list of sources
Source0: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
@@ -41,7 +41,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20020206, binutils
PreReq: OpenPKG, openpkg >= 20020206
AutoReq: no
AutoReqProv: no
@@ -68,7 +68,14 @@
Imakefile
xmkmf
%{l_make} %{l_mflags -O} Makefiles
- %{l_make} %{l_mflags -O}
+ %{l_shtool} subst \
+ -e 's; -M mapfile;;g' \
+ Makefile
+ %{l_make} %{l_mflags -O} LD=%{l_prefix}/bin/ld MAKE=%{l_prefix}/bin/make
+ if [ ! -f libXaw3d.a ]; then
+ %{l_prefix}/bin/ar -rs libXaw3d.a *.o
+ ranlib libXaw3d.a
+ fi
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3967 -r1.3968 news.txt
--- openpkg-web/news.txt 5 Apr 2003 11:30:06 -0000 1.3967
+++ openpkg-web/news.txt 5 Apr 2003 15:33:24 -0000 1.3968
@@ -1,3 +1,4 @@
+05-Apr-2003: Upgraded package: P<xaw3d-1.5-20030405>
05-Apr-2003: Upgraded package: P<pdflib-5.0.0-20030405>
05-Apr-2003: Upgraded package: P<openldap-2.1.17-20030405>
05-Apr-2003: Upgraded package: P<aft-5.08b-20030405>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
