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 Date: 30-Jan-2003 16:54:13
Branch: HEAD Handle: 2003013015541200
Modified files:
openpkg-src/mtr mtr.spec
Log:
- mtr by default searches for Gtk/X11, make this explicit and optional
- mtr requires ncurses
- fix indentation in %description
Summary:
Revision Changes Path
1.3 +17 -9 openpkg-src/mtr/mtr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mtr/mtr.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mtr.spec
--- openpkg-src/mtr/mtr.spec 30 Jan 2003 15:46:10 -0000 1.2
+++ openpkg-src/mtr/mtr.spec 30 Jan 2003 15:54:12 -0000 1.3
@@ -35,6 +35,9 @@
Version: 0.52
Release: 20030130
+# package options
+%option with_x11 no
+
# list of sources
Source0: ftp://ftp.bitwizard.nl/mtr/mtr-%{version}.tar.gz
Patch0: mtr.patch
@@ -42,30 +45,35 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, gtk
-PreReq: OpenPKG, openpkg >= 20030103, gtk
+BuildPreReq: OpenPKG, openpkg >= 20030103, ncurses
+PreReq: OpenPKG, openpkg >= 20030103, ncurses
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11, gtk
+PreReq: X11, gtk
+%endif
AutoReq: no
AutoReqProv: no
%description
- mtr combines the functionality of the 'traceroute' and 'ping' programs
- in a single network diagnostic tool.
+ mtr combines the functionality of the traceroute(8) and ping(8)
+ programs in a single network diagnostic tool.
%prep
%setup -q
- %patch0 -p0
+ %patch -p0
%build
CC="%{l_cc}" \
- CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
- --with-gtk-prefix=%{l_prefix} \
- --with-gtk-exec-prefix=%{l_prefix}
+%if "%{with_x11}" == "yes"
+ --with-gtk-prefix=%{l_prefix}
+%else
+ --without-gtk
+%endif
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
