OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2002 16:10:46
Branch: HEAD Handle: 2002101115104600
Modified files:
openpkg-src/qt qt.spec
Log:
Precommittal before radical changes to support upcoming OSSP development.
Summary:
Revision Changes Path
1.37 +20 -7 openpkg-src/qt/qt.spec
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.36 -r1.37 qt.spec
--- openpkg-src/qt/qt.spec 4 Oct 2002 14:07:12 -0000 1.36
+++ openpkg-src/qt/qt.spec 11 Oct 2002 14:10:46 -0000 1.37
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.0.5
-Release: 20021004
+Release: 20021011
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -41,8 +41,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, gcc, X11, freetype
-PreReq: OpenPKG, openpkg >= 20020206, X11, freetype
+BuildPreReq: OpenPKG, openpkg >= 20020206, gcc, X11
+PreReq: OpenPKG, openpkg >= 20020206, X11
AutoReq: no
AutoReqProv: no
@@ -72,11 +72,15 @@
esac
echo "yes" | ./configure \
-prefix %{l_prefix} -release \
+ -docdir %{l_prefix}/share/qt/doc \
+ -plugindir %{l_prefix}/share/qt/plugins \
+ -datadir %{l_prefix}/share/qt/data \
+ -release -static -qt-gif -qt-zlib \
-static -qt-gif -qt-zlib \
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
-no-nas-sound -no-tablet -no-xkb \
- -xft -sm -xinerama -xrender \
+ -no-xft -sm -xinerama -xrender \
-L`%{l_prefix}/etc/rc --query x11_libdir` \
-R`%{l_prefix}/etc/rc --query x11_libdir`
%{l_make} %{l_mflags -O} \
@@ -84,8 +88,6 @@
symlinks src-qmake src-moc sub-src sub-tools
# FIXME: "-Wl,-rpath,/tmp/qt-x11-free-3.0.4/lib"
# FIXME: "QSettings: error creating /cw/.qt"
- # FIXME: "libpng warning: Application was compiled with png.h from libpng-1.2.3"
- # "libpng warning: Application is running with png.c from libpng-1.0.12"
%install
rm -rf $RPM_BUILD_ROOT
@@ -95,7 +97,11 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/lib \
$RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
- $RPM_BUILD_ROOT%{l_prefix}/man/man3
+ $RPM_BUILD_ROOT%{l_prefix}/man/man3 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html \
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/plugins \
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/data
# copy binaries, headers, and then libraries to their target.
%{l_shtool} install -c -s -m 755 \
@@ -110,6 +116,10 @@
include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
%{l_shtool} install -c -m 644 \
include/private/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/private/
+ %{l_shtool} install -c -m 644 \
+ doc/html/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html/
+ %{l_shtool} install -c -m 644 \
+ tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
( cd lib && tar cf - * ) |\
( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
( cd doc/man/man3
@@ -118,6 +128,9 @@
done
%{l_shtool} install -c -m 644 \
*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
+ cd ../man1
+ %{l_shtool} install -c -m 644 \
+ *.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
)
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
