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-Aug-2003 22:53:56
Branch: HEAD Handle: 2003083021535402
Modified files:
openpkg-src/kde-base kde-base.spec
openpkg-web news.txt
Log:
make sure OpenPKG Qt is found before a possibly existing Qt inside the
vendor X11R6 area
Summary:
Revision Changes Path
1.2 +4 -3 openpkg-src/kde-base/kde-base.spec
1.6347 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kde-base/kde-base.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 kde-base.spec
--- openpkg-src/kde-base/kde-base.spec 18 Aug 2003 18:23:30 -0000 1.1
+++ openpkg-src/kde-base/kde-base.spec 30 Aug 2003 20:53:56 -0000 1.2
@@ -37,7 +37,7 @@
Group: KDE
License: GPL
Version: %{V_base}
-Release: 20030818
+Release: 20030830
# list of sources
Source0:
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
@@ -92,8 +92,8 @@
%build
# set standard KDE/Qt build environment
- export CC="%{l_cc}"
- export CXX="%{l_cxx}"
+ export CC="%{l_cc} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
+ export CXX="%{l_cxx} `%{l_prefix}/bin/pkg-config --libs-only-L kde-qt`"
export CFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt`
%{l_cflags -O}"
export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt`
%{l_cxxflags -O}"
export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt`
%{l_cppflags}"
@@ -127,6 +127,7 @@
export kde_widgetdir='\${prefix}/lib/kde/plugins/designer'
# configure package
+ export DO_NOT_COMPILE="kdm"
./configure \
--prefix=%{l_prefix} \
--bindir=%{l_prefix}/libexec/kde \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6346 -r1.6347 news.txt
--- openpkg-web/news.txt 30 Aug 2003 20:52:33 -0000 1.6346
+++ openpkg-web/news.txt 30 Aug 2003 20:53:54 -0000 1.6347
@@ -1,3 +1,4 @@
+30-Aug-2003: Upgraded package: P<kde-base-3.1.3-20030830>
30-Aug-2003: Upgraded package: P<kde-libs-3.1.3a-20030830>
30-Aug-2003: Upgraded package: P<kde-arts-1.1.3-20030830>
30-Aug-2003: Upgraded package: P<tcpreplay-1.4.5-20030830>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
