OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 13-Aug-2003 11:59:01
Branch: HEAD Handle: 2003081310590001
Modified files:
openpkg-src/mico mico.spec
openpkg-web news.txt
Log:
add explicit X11 support and do not stumble over our feets if
libmicox.a cannot be moved
Summary:
Revision Changes Path
1.46 +16 -1 openpkg-src/mico/mico.spec
1.6139 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 mico.spec
--- openpkg-src/mico/mico.spec 13 Aug 2003 09:01:54 -0000 1.45
+++ openpkg-src/mico/mico.spec 13 Aug 2003 09:59:01 -0000 1.46
@@ -37,6 +37,7 @@
# package options
%option with_ssl no
+%option with_x11 no
%option with_qt no
%option with_gtk no
%option with_tcl no
@@ -55,6 +56,10 @@
BuildPreReq: openssl
PreReq: openssl
%endif
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
%if "%{with_qt}" == "yes"
BuildPreReq: qt, pkgconfig
PreReq: qt
@@ -115,6 +120,13 @@
%if "%{with_ssl}" == "yes"
--with-ssl=%{l_prefix} \
%endif
+%if "%{with_x11}" == "yes"
+ --with-x \
+ --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+%else
+ --without-x \
+%endif
%if "%{with_qt}" == "yes"
--with-qt=%{l_prefix} \
%endif
@@ -160,9 +172,12 @@
mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/nsd.8 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8/mico-nsd.8
( cd $RPM_BUILD_ROOT%{l_prefix}/lib
- for name in mico micoaux micocoss micoir micox; do
+ for name in mico micoaux micocoss micoir; do
mv lib${name}%{version}.a lib${name}.a
done
+%if "%{with_x11}" == "yes"
+ mv libmicox%{version}.a libmicox.a
+%endif
%if "%{with_qt}" == "yes"
mv libmicoqt%{version}.a libmicoqt.a
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6138 -r1.6139 news.txt
--- openpkg-web/news.txt 13 Aug 2003 09:35:34 -0000 1.6138
+++ openpkg-web/news.txt 13 Aug 2003 09:59:00 -0000 1.6139
@@ -1,3 +1,4 @@
+13-Aug-2003: Upgraded package: P<mico-2.3.10-20030813>
13-Aug-2003: Upgraded package: P<linkchecker-1.9.0-20030813>
13-Aug-2003: Upgraded package: P<cvsd-0.9.19-20030813>
13-Aug-2003: Upgraded package: P<amavisd-20030616p4-20030813>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
