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: 04-Aug-2003 15:39:05
Branch: HEAD Handle: 2003080414390301
Modified files:
openpkg-src/xaw3d xaw3d.spec
openpkg-web news.txt
Log:
clean up and align with xmkmf-workaround
Summary:
Revision Changes Path
1.20 +10 -23 openpkg-src/xaw3d/xaw3d.spec
1.6025 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xaw3d/xaw3d.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 xaw3d.spec
--- openpkg-src/xaw3d/xaw3d.spec 23 Jul 2003 13:32:30 -0000 1.19
+++ openpkg-src/xaw3d/xaw3d.spec 4 Aug 2003 13:39:04 -0000 1.20
@@ -42,7 +42,7 @@
Group: XWindow
License: GPL
Version: 1.5
-Release: 20030723
+Release: 20030804
# list of sources
Source0: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
@@ -50,7 +50,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, binutils, bison, flex
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, binutils, bison, flex, gcc
PreReq: OpenPKG, openpkg >= 20020206
AutoReq: no
AutoReqProv: no
@@ -69,28 +69,15 @@
%build
cd xc/lib/Xaw3d/
%{l_shtool} mkdir -f -p -m 755 X11/Xaw3d
- ( cd X11/Xaw3d; ln -s ../../*.h . ) || exit $?
+ ln -s *.h X11/Xaw3d/.
+
PATH=$PATH:`%{l_prefix}/etc/rc --query x11_bindir`
- %{l_shtool} subst \
- -e 's;^#[ ]*\(EXTRA_DEFINES.*\);\1;' \
- -e 's;^#[ ]*\(EXTRA_INCLUDES.*\);\1;' \
- Imakefile
- xmkmf
- %{l_make} %{l_mflags -O} Makefiles
- %{l_shtool} subst \
- -e 's; -M mapfile;;g' \
- -e 's;\(PICFLAGS =.*\) -Kpic\(.*\)$;\1\2;g' \
- -e 's;\(CCOPTIONS =.*\) -Xc\(.*\)$;\1\2;g' \
- -e 's;\(CCOPTIONS =.*\) -x.*\(.*\)$;\1\2;g' \
- -e 's;\(CCOPTIONS =.*\) -x.*\(.*\)$;\1\2;g' \
- -e 's;\(CCOPTIONS =.*\) -x.*\(.*\)$;\1\2;g' \
- -e 's;\(CCOPTIONS =.*\) -x.*\(.*\)$;\1\2;g' \
- Makefile
- %{l_make} %{l_mflags -O} LD=ld
- if [ ! -f libXaw3d.a ]; then
- ar cr libXaw3d.a *.o
- ranlib libXaw3d.a
- fi
+ # xmkmf -a
+ x11config=`%{l_prefix}/etc/rc --query x11_libdir`/X11/config
+ imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
+ %{l_make} Makefiles
+ %{l_make} includes
+ %{l_make}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6024 -r1.6025 news.txt
--- openpkg-web/news.txt 4 Aug 2003 12:28:54 -0000 1.6024
+++ openpkg-web/news.txt 4 Aug 2003 13:39:03 -0000 1.6025
@@ -1,3 +1,4 @@
+04-Aug-2003: Upgraded package: P<xaw3d-1.5-20030804>
04-Aug-2003: Upgraded package: P<ddd-3.3.1-20030804>
04-Aug-2003: Upgraded package: P<pgadmin-0.8.0.20030804-20030804>
04-Aug-2003: Upgraded package: P<vim-6.2.58-20030804>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
