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: 15-Jan-2003 11:52:09
Branch: HEAD Handle: 2003011510520801
Modified files:
openpkg-src/xpm xpm.spec
openpkg-web news.txt
Log:
Force building static lib, force imake, force imake to use %{l_make}
Summary:
Revision Changes Path
1.4 +11 -3 openpkg-src/xpm/xpm.spec
1.2806 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xpm/xpm.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 xpm.spec
--- openpkg-src/xpm/xpm.spec 14 Jan 2003 10:11:38 -0000 1.3
+++ openpkg-src/xpm/xpm.spec 15 Jan 2003 10:52:09 -0000 1.4
@@ -35,7 +35,7 @@
Group: Graphics
License: X11
Version: 3.4k
-Release: 20030104
+Release: 20030115
# list of sources
Source0: http://koala.ilog.fr/ftp/pub/xpm/xpm-%{version}.tar.gz
@@ -69,11 +69,19 @@
%{l_shtool} subst \
-e 's;^XCOMM \(IMAKE_DEFINES = -DSharedLibXpm=NO\);\1;' \
Imakefile
+ %{l_shtool} subst \
+ -e 's;^XCOMM \(#define SharedLibXpm NO\);\1;' \
+ lib/Imakefile
PATH="$PATH:`%{l_prefix}/etc/rc --query x11_bindir`"
- xmkmf -a
+
+ # xmkmf -a
+ x11config=`%{l_prefix}/etc/rc --query x11_libdir`/X11/config
+ imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
+ %{l_make} Makefiles IMAKE_DEFINES="-DHasGcc2 -UHasSunC"
+ %{l_make} includes
# build package
- %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags} MAKE=%{l_make}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2805 -r1.2806 news.txt
--- openpkg-web/news.txt 15 Jan 2003 10:46:39 -0000 1.2805
+++ openpkg-web/news.txt 15 Jan 2003 10:52:08 -0000 1.2806
@@ -1,3 +1,4 @@
+15-Jan-2003: Upgraded package: P<xpm-3.4k-20030115>
15-Jan-2003: Upgraded package: P<hexcurse-1.54-20030115>
15-Jan-2003: Upgraded package: P<libtasn1-0.1.2-20030115>
15-Jan-2003: Upgraded package: P<keychain-2.0.2-20030115>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
