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: 30-Dec-2002 20:48:42
Branch: HEAD Handle: 2002123019484001
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
switch to %option(s); no need to ensure optional things
Summary:
Revision Changes Path
1.52 +5 -25 openpkg-src/qt/qt.spec
1.2451 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 qt.spec
--- openpkg-src/qt/qt.spec 17 Dec 2002 10:54:51 -0000 1.51
+++ openpkg-src/qt/qt.spec 30 Dec 2002 19:48:41 -0000 1.52
@@ -24,9 +24,7 @@
##
# package options
-%ifndef with_xft
-%define with_xft no
-%endif
+%option with_xft no
# package information
Name: qt
@@ -38,7 +36,7 @@
Group: XWindow
License: GPL
Version: 3.1.1
-Release: 20021217
+Release: 20021230
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -46,8 +44,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, gcc
-PreReq: OpenPKG, openpkg >= 20020206, X11
+BuildPreReq: OpenPKG, openpkg >= 20021230, X11, gcc
+PreReq: OpenPKG, openpkg >= 20021230, X11
AutoReq: no
AutoReqProv: no
@@ -64,8 +62,7 @@
similar to templates in C++, but with influences from component
technology.
- Options:
- --define 'with_xft %{with_xft}'
+ %options
%prep
%setup -q -n qt-x11-free-%{version}
@@ -79,22 +76,6 @@
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
- # ensure that libXft exists
-%if "%{with_xft}" == "yes"
- found_xft=""
- for ext in a so sl; do
- if [ -f "`%{l_prefix}/etc/rc --query x11_libdir`/libXft.$ext" ]; then
- found_xft="da"
- break;
- fi
- done
- if [ ".$found_xft" = . ]; then
- echo "ERROR! Library libXft could not be found," 2>&1;
- echo "please consider building without with_xft" 2>&1;
- exit 1;
- fi
-%endif
-
# special trolltech configuration
echo "yes" | ./configure \
-prefix %{l_prefix} \
@@ -113,7 +94,6 @@
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
- # FIXME: "-Wl,-rpath,/tmp/qt-x11-free-3.0.4/lib"
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2450 -r1.2451 news.txt
--- openpkg-web/news.txt 30 Dec 2002 19:47:35 -0000 1.2450
+++ openpkg-web/news.txt 30 Dec 2002 19:48:40 -0000 1.2451
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<qt-3.1.1-20021230>
30-Dec-2002: Upgraded package: P<qpopper-4.0.4-20021230>
30-Dec-2002: Upgraded package: P<pureftpd-1.1.0-20021230>
30-Dec-2002: Upgraded package: P<proftpd-1.2.7-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
