[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
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: 21-Dec-2003 10:34:48 Branch: HEAD Handle: 2003122109344602 Modified files: openpkg-src/qt qt.spec openpkg-web news.txt Log: bless for PLUS class Summary: RevisionChanges Path 1.97+2 -2 openpkg-src/qt/qt.spec 1.7851 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/qt/qt.spec $ cvs diff -u -r1.96 -r1.97 qt.spec --- openpkg-src/qt/qt.spec2 Dec 2003 15:42:07 - 1.96 +++ openpkg-src/qt/qt.spec21 Dec 2003 09:34:48 - 1.97 @@ -29,11 +29,11 @@ URL: http://www.trolltech.com/products/qt/x11.html Vendor: TrollTech AS Packager: The OpenPKG Project -Distribution: OpenPKG [EVAL] +Distribution: OpenPKG [PLUS] Group:XWindow License: GPL Version: 3.2.3 -Release: 20031202 +Release: 20031221 # package library options (each 'yes' builds more libraries) %option with_shared no @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7850 -r1.7851 news.txt --- openpkg-web/news.txt 21 Dec 2003 09:32:32 - 1.7850 +++ openpkg-web/news.txt 21 Dec 2003 09:34:46 - 1.7851 @@ -1,3 +1,4 @@ +21-Dec-2003: Upgraded package: P 21-Dec-2003: Upgraded package: P 21-Dec-2003: Upgraded package: P 21-Dec-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Dec-2003 16:42:07
Branch: HEAD Handle: 2003120215420502
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
add sed dependency, because 'backslash-t' gets otherwise interpreted
as a normal 't'
Summary:
RevisionChanges Path
1.96+2 -2 openpkg-src/qt/qt.spec
1.7640 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.95 -r1.96 qt.spec
--- openpkg-src/qt/qt.spec28 Nov 2003 09:56:31 - 1.95
+++ openpkg-src/qt/qt.spec2 Dec 2003 15:42:07 - 1.96
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.3
-Release: 20031128
+Release: 20031202
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -51,7 +51,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909, X11, xft, gcc
+BuildPreReq: OpenPKG, openpkg >= 20030909, X11, xft, gcc, sed
PreReq: OpenPKG, openpkg >= 20030909, X11, xft
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7639 -r1.7640 news.txt
--- openpkg-web/news.txt 2 Dec 2003 15:03:40 - 1.7639
+++ openpkg-web/news.txt 2 Dec 2003 15:42:05 - 1.7640
@@ -1,3 +1,4 @@
+02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
02-Dec-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Nov-2003 10:56:32
Branch: HEAD Handle: 2003112809563001
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Remove dependency to sed, as issue regarding '\t' is unreproducible
and easily solvable anyways
Summary:
RevisionChanges Path
1.95+2 -2 openpkg-src/qt/qt.spec
1.7585 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.94 -r1.95 qt.spec
--- openpkg-src/qt/qt.spec20 Nov 2003 15:20:26 - 1.94
+++ openpkg-src/qt/qt.spec28 Nov 2003 09:56:31 - 1.95
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.3
-Release: 20031120
+Release: 20031128
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -51,7 +51,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909, X11, xft, gcc, sed
+BuildPreReq: OpenPKG, openpkg >= 20030909, X11, xft, gcc
PreReq: OpenPKG, openpkg >= 20030909, X11, xft
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7584 -r1.7585 news.txt
--- openpkg-web/news.txt 28 Nov 2003 09:52:32 - 1.7584
+++ openpkg-web/news.txt 28 Nov 2003 09:56:30 - 1.7585
@@ -1,3 +1,4 @@
+28-Nov-2003: Upgraded package: P
28-Nov-2003: Upgraded package: P
28-Nov-2003: New package: P
27-Nov-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 20-Nov-2003 13:06:10
Branch: HEAD Handle: 2003112012060802
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Replace explicit xrender requirement with implicit one
Summary:
RevisionChanges Path
1.93+2 -2 openpkg-src/qt/qt.spec
1.7478 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.92 -r1.93 qt.spec
--- openpkg-src/qt/qt.spec19 Nov 2003 14:54:03 - 1.92
+++ openpkg-src/qt/qt.spec20 Nov 2003 12:06:10 - 1.93
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.3
-Release: 20031119
+Release: 20031120
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -51,7 +51,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909, X11, gcc, sed, xrender, xft
+BuildPreReq: OpenPKG, openpkg >= 20030909, X11, gcc, sed, xft
PreReq: OpenPKG, openpkg >= 20030909, X11
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7477 -r1.7478 news.txt
--- openpkg-web/news.txt 20 Nov 2003 11:16:36 - 1.7477
+++ openpkg-web/news.txt 20 Nov 2003 12:06:08 - 1.7478
@@ -1,3 +1,4 @@
+20-Nov-2003: Upgraded package: P
20-Nov-2003: Upgraded package: P
20-Nov-2003: Upgraded package: P
20-Nov-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Nov-2003 15:54:03
Branch: HEAD Handle: 2003111914540102
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Add support for Xft and Xrender X11 library extensions
Summary:
RevisionChanges Path
1.92+18 -7 openpkg-src/qt/qt.spec
1.7473 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.91 -r1.92 qt.spec
--- openpkg-src/qt/qt.spec15 Nov 2003 19:55:32 - 1.91
+++ openpkg-src/qt/qt.spec19 Nov 2003 14:54:03 - 1.92
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.3
-Release: 20031115
+Release: 20031119
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -46,12 +46,13 @@
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
+Patch0: qt.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909, X11, freetype, gcc, sed
-PreReq: OpenPKG, openpkg >= 20030909, X11, freetype
+BuildPreReq: OpenPKG, openpkg >= 20030909, X11, gcc, sed, xrender, xft
+PreReq: OpenPKG, openpkg >= 20030909, X11
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -78,6 +79,7 @@
%prep
%setup -q -n qt-x11-free-%{version}
+%patch -p1
# avoid dependencies external to OpenPKG instance
cp -rp mkspecs mkspecs.fresh
@@ -92,6 +94,15 @@
mkspecs/macx-pbuilder/qmake.conf \
mkspecs/openbsd-g++/qmake.conf
+# correctly detect OpenPKG xrender and xft installations
+%{l_shtool} subst \
+-e 's;INCDIRS=";INCDIRS="%{l_prefix}/include ;g' \
+-e 's;LIBDIRS=";LIBDIRS="%{l_prefix}/lib ;g' \
+-e 's;freetype2/freetype/;freetype/;g' \
+-e 's;freetype2;freetype;g' \
+config.tests/x11/xfreetype.test \
+config.tests/x11/xrender.test
+
# repair nonstandard posix thread test macro usage
%{l_shtool} subst \
-e 's/\(defined(_POSIX_THREAD_SAFE_FUNCTIONS)\)/(\1 \&\&
_POSIX_THREAD_SAFE_FUNCTIONS-0>0)/g' \
@@ -146,7 +157,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -shared -stl -sm \
+-release -shared -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -179,7 +190,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -shared -stl -sm \
+-release -shared -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -218,7 +229,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -static -stl -sm \
+-release -static -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -257,7 +268,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -static -stl -sm \
+-release -static -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7472 -r1.7473 news.txt
--- openpkg-web/news.txt 19 Nov 2003 14:05:51 - 1.7472
+++ openpkg-web/news.txt 19 Nov 2003 14:54:01 - 1.7473
@@ -1,3 +1
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
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: 07-Nov-2003 21:35:25
Branch: HEAD Handle: 2003110720352401
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
adjust for new freetype filesystem layout
Summary:
RevisionChanges Path
1.90+5 -5 openpkg-src/qt/qt.spec
1.7324 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.89 -r1.90 qt.spec
--- openpkg-src/qt/qt.spec16 Oct 2003 14:47:20 - 1.89
+++ openpkg-src/qt/qt.spec7 Nov 2003 20:35:25 - 1.90
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.2
-Release: 20031016
+Release: 20031107
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -148,7 +148,7 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
--I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-R$rflags \
-no-thread
@@ -181,7 +181,7 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
--I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-R$rflags \
-thread
@@ -220,7 +220,7 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -static -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
--I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-no-thread
@@ -259,7 +259,7 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -static -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
--I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-thread
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7323 -r1.7324 news.txt
--- openpkg-web/news.txt 7 Nov 2003 20:32:35 - 1.7323
+++ openpkg-web/news.txt 7 Nov 2003 20:35:24 - 1.7324
@@ -1,3 +1,4 @@
+07-Nov-2003: Upgraded package: P
07-Nov-2003: Upgraded package: P
07-Nov-2003: Upgraded package: P
07-Nov-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 15-Sep-2003 10:58:54
Branch: HEAD Handle: 2003091509585202
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
adjust for new %{l_platform} arrangement
Summary:
RevisionChanges Path
1.87+3 -3 openpkg-src/qt/qt.spec
1.6560 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.86 -r1.87 qt.spec
--- openpkg-src/qt/qt.spec12 Sep 2003 13:00:31 - 1.86
+++ openpkg-src/qt/qt.spec15 Sep 2003 08:58:54 - 1.87
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030912
+Release: 20030915
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -110,10 +110,10 @@
# and determine the target platform to build
HOME=`pwd`
QTDIR=`pwd`
-case "%{l_target}" in
+case "%{l_platform -t}" in
*-freebsd* ) oscomp="freebsd-g++" ;;
*-linux* ) oscomp="linux-g++";;
-*-solaris* ) oscomp="solaris-g++" ;;
+*-sunos* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6559 -r1.6560 news.txt
--- openpkg-web/news.txt 15 Sep 2003 08:55:36 - 1.6559
+++ openpkg-web/news.txt 15 Sep 2003 08:58:52 - 1.6560
@@ -1,3 +1,4 @@
+15-Sep-2003: Upgraded package: P
15-Sep-2003: Upgraded package: P
15-Sep-2003: Upgraded package: P
15-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
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: 12-Sep-2003 15:00:31
Branch: HEAD Handle: 2003091214002803
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
workaround for making again 100% speclint clean
Summary:
RevisionChanges Path
1.86+4 -2 openpkg-src/qt/qt.spec
1.6532 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.85 -r1.86 qt.spec
--- openpkg-src/qt/qt.spec9 Sep 2003 23:58:48 - 1.85
+++ openpkg-src/qt/qt.spec12 Sep 2003 13:00:31 - 1.86
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030910
+Release: 20030912
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -304,11 +304,13 @@
# copy binaries, headers, and then libraries to their target
%{l_shtool} install -c -s -m 755 \
bin/qmake bin/moc bin/uic \
+$RPM_BUILD_ROOT%{l_prefix}/bin/
%if "%{with_tools}" == "yes"
+%{l_shtool} install -c -s -m 755 \
bin/linguist bin/lrelease bin/lupdate \
bin/assistant bin/qtconfig bin/designer \
-%endif
$RPM_BUILD_ROOT%{l_prefix}/bin/
+%endif
# copy mkspecs directory for later portable use of qmake
cp -rp mkspecs.fresh $RPM_BUILD_ROOT%{l_prefix}/share/qt/mkspecs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6531 -r1.6532 news.txt
--- openpkg-web/news.txt 12 Sep 2003 11:26:05 - 1.6531
+++ openpkg-web/news.txt 12 Sep 2003 13:00:28 - 1.6532
@@ -1,3 +1,4 @@
+12-Sep-2003: Upgraded package: P
12-Sep-2003: Upgraded package: P
12-Sep-2003: Upgraded package: P
12-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Sep-2003 01:58:49
Branch: HEAD Handle: 2003091000584602
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Merge pc file substitutions with install stage, remove unnecessary
file moves, and remove installation to qtdyn directory to install
section
Summary:
RevisionChanges Path
1.85+34 -25 openpkg-src/qt/qt.spec
1.6483 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.84 -r1.85 qt.spec
--- openpkg-src/qt/qt.spec8 Sep 2003 07:25:18 - 1.84
+++ openpkg-src/qt/qt.spec9 Sep 2003 23:58:48 - 1.85
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030908
+Release: 20030910
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -194,10 +194,7 @@
%endif
# already install our shared libs, and clear out the rest
-%{l_shtool} mkdir -f -p -m 755 \
-$RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn
-%{l_tar} cf - lib/*.so* lib/*.prl lib/*.pc | %{l_tar} xf - \
--C $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
+cp -rf lib dyn
rm -f lib/*
%endif
@@ -241,9 +238,6 @@
%endif
%if "%{with_threads}" == "yes"
-# generate the multithreaded library definitions also
-mv lib/qt.pc .
-
# run configure a second time to get threaded libs as well
CC="%{l_cc}" \
CXX="%{l_cxx}" \
@@ -282,29 +276,20 @@
sub-uic
) || exit $?
%endif
-
-# patch the badly generated pkg-config (.pc) files
-mv qt.pc lib
-%{l_shtool} subst \
--e "s;-l/.*\.pc ;;g" \
--e "s;-L[^ \t]*[ \t];;g" \
--e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
--e "s;\t; ;g" \
--e "s; \+; ;g" \
--e "s; *$;;g" \
-lib/qt.pc \
-lib/qt-mt.pc
-%{l_shtool} subst \
--e "s;\(Libs.*$\);\1 -pthread;g" \
-lib/qt-mt.pc
%endif
%install
rm -rf $RPM_BUILD_ROOT
+# calculate X11 lib directory in advance
+l_x11_libdir=`%{l_prefix}/etc/rc --query x11_libdir`
+
# make directory structure
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
+%if "%{with_shared}" == "yes"
+$RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn \
+%endif
%if "%{with_tools}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
@@ -340,9 +325,33 @@
%{l_shtool} install -c -m 644 \
include/private/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/private/
%{l_shtool} install -c -m 644 \
-lib/*.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
-%{l_shtool} install -c -m 644 \
lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib/
+%{l_shtool} install -c -m 644 \
+-e "s;\t; ;g" \
+-e "s;\ \+; ;g" \
+-e "s;\ *$;;g" \
+-e "s;-[lL]\ *\-;\-;g" \
+-e "s;-l\ *[^ ]*qt\.pc\ *;;g" \
+-e "s;-L\ *.[^ ]*\ *;;g" \
+-e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
+-e "s;\(\-l\);\-lqt \1;" \
+lib/qt.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
+%if "%{with_threads}" == "yes"
+%{l_shtool} install -c -m 644 \
+-e "s;\t; ;g" \
+-e "s;\ \+; ;g" \
+-e "s;\ *$;;g" \
+-e "s;-[lL]\ *\-;\-;g" \
+-e "s;-l\ *[^ ]*qt\-mt\.pc\ *;;g" \
+-e "s;-L\ *.[^ ]*\ *;;g" \
+-e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
+-e "s;\(\-l\);\-lqt\-mt \1;" \
+lib/qt-mt.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
+%endif
+%if "%{with_shared}" == "yes"
+%{l_shtool} install -c -m 644 \
+dyn/lib*.so* dyn/*.prl dyn/*.pc $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
+%endif
%if "%{with_tools}" == "yes"
%{l_shtool} install -c -m 644 \
tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6482 -r1.6483 news.txt
--- openpkg-web/news.txt 9 Sep 2003 18:33:33 - 1.6482
+++ openpkg-web/news.txt 9 Sep 2003 23:58:46 -
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Sep-2003 09:25:18
Branch: HEAD Handle: 2003090808251602
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Patch pc files more and require sed to match tabs correctly
Summary:
RevisionChanges Path
1.84+13 -5 openpkg-src/qt/qt.spec
1.6444 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.83 -r1.84 qt.spec
--- openpkg-src/qt/qt.spec6 Sep 2003 13:32:48 - 1.83
+++ openpkg-src/qt/qt.spec8 Sep 2003 07:25:18 - 1.84
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030906
+Release: 20030908
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -50,7 +50,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc, sed
PreReq: OpenPKG, openpkg >= 20030103, X11, freetype
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
@@ -283,11 +283,19 @@
) || exit $?
%endif
-# patch and prepare pkg-config (.pc) files
+# patch the badly generated pkg-config (.pc) files
mv qt.pc lib
%{l_shtool} subst \
--e 's;[ \t]*$;;g' \
--e 's;\(Libs.*$\);\1 -pthread;g' \
+-e "s;-l/.*\.pc ;;g" \
+-e "s;-L[^ \t]*[ \t];;g" \
+-e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
+-e "s;\t; ;g" \
+-e "s; \+; ;g" \
+-e "s; *$;;g" \
+lib/qt.pc \
+lib/qt-mt.pc
+%{l_shtool} subst \
+-e "s;\(Libs.*$\);\1 -pthread;g" \
lib/qt-mt.pc
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6443 -r1.6444 news.txt
--- openpkg-web/news.txt 8 Sep 2003 06:08:23 - 1.6443
+++ openpkg-web/news.txt 8 Sep 2003 07:25:16 - 1.6444
@@ -1,3 +1,4 @@
+08-Sep-2003: Upgraded package: P
08-Sep-2003: Upgraded package: P
07-Sep-2003: Upgraded package: P
07-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Sep-2003 15:32:48
Branch: HEAD Handle: 2003090614324602
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Fix more problems with the optional shared library build
Summary:
RevisionChanges Path
1.83+10 -18 openpkg-src/qt/qt.spec
1.6431 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.82 -r1.83 qt.spec
--- openpkg-src/qt/qt.spec4 Sep 2003 17:02:13 - 1.82
+++ openpkg-src/qt/qt.spec6 Sep 2003 13:32:48 - 1.83
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030904
+Release: 20030906
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -146,7 +146,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -static -shared -stl -sm \
+-release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -159,9 +159,6 @@
LD_LIBRARY_PATH=$QTDIR/lib \
sub-src sub-plugins
-# keep only static library pkg-config build definitions
-rm lib/qt.pc
-
%if "%{with_threads}" == "yes"
# run configure a second time to get threaded libs as well
CC="%{l_cc}" \
@@ -182,7 +179,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
--release -static -shared -stl -sm \
+-release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -194,10 +191,14 @@
MAKE="%{l_make} %{l_mflags -O}" \
LD_LIBRARY_PATH=$QTDIR/lib \
sub-src sub-plugins
-
-# keep only static library pkg-config build definitions
-rm lib/qt-mt.pc
%endif
+
+# already install our shared libs, and clear out the rest
+%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn
+%{l_tar} cf - lib/*.so* lib/*.prl lib/*.pc | %{l_tar} xf - \
+-C $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
+rm -f lib/*
%endif
# start of static lib build
@@ -235,7 +236,6 @@
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
- LD_LIBRARY_PATH=$QTDIR/lib \
sub-uic
) || exit $?
%endif
@@ -279,7 +279,6 @@
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
- LD_LIBRARY_PATH=$QTDIR/lib \
sub-uic
) || exit $?
%endif
@@ -298,9 +297,6 @@
# make directory structure
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
-%if "%{with_shared}" == "yes"
-$RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn \
-%endif
%if "%{with_tools}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
@@ -339,10 +335,6 @@
lib/*.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
%{l_shtool} install -c -m 644 \
lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib/
-%if "%{with_shared}" == "yes"
-%{l_tar} cf - lib/*.so* lib/*.prl | %{l_tar} xf - \
--C $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
-%endif
%if "%{with_tools}" == "yes"
%{l_shtool} install -c -m 644 \
tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6430 -r1.6431 news.txt
--- openpkg-web/news.txt 6 Sep 2003 08:09:55 - 1.6430
+++ openpkg-web/news.txt 6 Sep 2003 13:32:46 - 1.6431
@@ -1,3 +1,4 @@
+06-Sep-2003: Upgraded package: P
06-Sep-2003: Upgraded package: P
06-Sep-2003: Upgraded package: P
06-Sep-2003: Upgraded package: P
@@ .
_
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Sep-2003 19:02:14
Branch: HEAD Handle: 2003090418021201
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Organize options, link again to freetype, avoid anything in /usr/local
by hacking the qmake files in mkspecs, consolidate posix thread test
substitutions, correct warning text again, remove bashisms, add
missing local x11 paths, remove unused build flags, fix build problems
relating to wrong library path ordering
Summary:
RevisionChanges Path
1.82+51 -31 openpkg-src/qt/qt.spec
1.6400 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.81 -r1.82 qt.spec
--- openpkg-src/qt/qt.spec1 Sep 2003 16:03:07 - 1.81
+++ openpkg-src/qt/qt.spec4 Sep 2003 17:02:13 - 1.82
@@ -33,14 +33,16 @@
Group:XWindow
License: GPL
Version: 3.2.1
-Release: 20030901
+Release: 20030904
-# package options
+# package library options (each 'yes' builds more libraries)
+%option with_shared no
+%option with_threads yes
+
+# package extra options (additional nonlibrary components)
%option with_pgsqlno
%option with_mysqlno
%option with_toolsno
-%option with_shared no
-%option with_threads yes
# list of sources
Source0:
ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/qt-x11-free-%{version}.tar.bz2
@@ -48,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
-PreReq: OpenPKG, openpkg >= 20030103, X11
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc
+PreReq: OpenPKG, openpkg >= 20030103, X11, freetype
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -77,29 +79,41 @@
%prep
%setup -q -n qt-x11-free-%{version}
+# avoid dependencies external to OpenPKG instance
+cp -rp mkspecs mkspecs.fresh
+%{l_shtool} subst \
+-e 's;[ \t]*-I/usr/local/include;;g' \
+-e 's;[ \t]*/usr/local/include;;g' \
+-e 's;[ \t]*-L/usr/local/lib;;g' \
+-e 's;[ \t]*/usr/local/lib;;g' \
+mkspecs/darwin-g++/qmake.conf \
+mkspecs/freebsd-g++/qmake.conf \
+mkspecs/netbsd-g++/qmake.conf \
+mkspecs/macx-pbuilder/qmake.conf \
+mkspecs/openbsd-g++/qmake.conf
+
+# repair nonstandard posix thread test macro usage
+%{l_shtool} subst \
+-e 's/\(defined(_POSIX_THREAD_SAFE_FUNCTIONS)\)/(\1 \&\&
_POSIX_THREAD_SAFE_FUNCTIONS-0>0)/g' \
+src/dialogs/qfiledialog.cpp src/kernel/qfont_x11.cpp \
+src/tools/qdatetime.cpp src/tools/qdir_unix.cpp
+
%build
# display a warning that this package is a beast
( echo "The qt package requires about 320 MB of temporary disk space"
- echo "and two to four hours (depending on options) to build on a"
+ echo "and one to five hours (depending on options) to build on a"
echo "800 MHz system. Therefore, please be prepared and be patient."
) | %{l_rpmtool} msg -b -t notice
# set HOME to a writable directory for qsettings
# and set QTDIR to just the source tree directory
-export HOME=`pwd`
-export QTDIR=`pwd`
-
+# and determine the target platform to build
+HOME=`pwd`
+QTDIR=`pwd`
case "%{l_target}" in
-*-freebsd* ) oscomp="freebsd-g++"
- %{l_shtool} subst \
- -e
's/defined(_POSIX_THREAD_SAFE_FUNCTIONS)/_POSIX_THREAD_SAFE_FUNCTIONS - 0 >0/g' \
- src/dialogs/qfiledialog.cpp src/kernel/qfont_x11.cpp \
- src/tools/qdatetime.cpp src/tools/qdir_unix.cpp
- ;;
-*-linux* ) oscomp="linux-g++"
- ;;
-*-solaris* ) oscomp="solaris-g++"
- ;;
+*-freebsd* ) oscomp="freebsd-g++" ;;
+*-linux* ) oscomp="linux-g++";;
+*-solaris* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
@@ -108,14 +122,16 @@
-e 's;%{l_prefix}/lib;%{l_prefix}/lib/qtdyn;g' \
-e 's;-L;-R;g'`
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Sep-2003 18:03:07
Branch: HEAD Handle: 2003090117030502
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Correct RPATH to installed dynamic libraries
Summary:
RevisionChanges Path
1.81+1 -1 openpkg-src/qt/qt.spec
1.6365 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.80 -r1.81 qt.spec
--- openpkg-src/qt/qt.spec1 Sep 2003 07:47:39 - 1.80
+++ openpkg-src/qt/qt.spec1 Sep 2003 16:03:07 - 1.81
@@ -104,7 +104,7 @@
esac
# put in proper search paths for dynamic libraries
-rflags=`echo $LDFLAGS | %{l_shtool} subst \
+rflags=`echo '%{l_ldflags}' | %{l_shtool} subst \
-e 's;%{l_prefix}/lib;%{l_prefix}/lib/qtdyn;g' \
-e 's;-L;-R;g'`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6364 -r1.6365 news.txt
--- openpkg-web/news.txt 1 Sep 2003 13:58:35 - 1.6364
+++ openpkg-web/news.txt 1 Sep 2003 16:03:05 - 1.6365
@@ -1,3 +1,4 @@
+01-Sep-2003: Upgraded package: P
01-Sep-2003: Upgraded package: P
01-Sep-2003: Upgraded package: P
01-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 20-Aug-2003 08:54:08
Branch: HEAD Handle: 2003082007540601
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Do not claim pkgconfig as own directory
Summary:
RevisionChanges Path
1.75+7 -2 openpkg-src/qt/qt.spec
1.6239 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.74 -r1.75 qt.spec
--- openpkg-src/qt/qt.spec13 Aug 2003 09:01:53 - 1.74
+++ openpkg-src/qt/qt.spec20 Aug 2003 06:54:07 - 1.75
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.0
-Release: 20030813
+Release: 20030820
# package options
%option with_pgsqlno
@@ -196,6 +196,7 @@
mv $man `echo $man | sed -e 's;\.3qt$;.3;'`
done
+# copy files to their destinations
%{l_shtool} install -c -m 644 \
include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
%{l_shtool} install -c -m 644 \
@@ -216,7 +217,11 @@
doc/man/man3/*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
%{l_shtool} install -c -m 644 \
doc/man/man1/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+# determine installation files
+%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+%{l_files_std} \
+'%not %dir %{l_prefix}/lib/pkgconfig'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6238 -r1.6239 news.txt
--- openpkg-web/news.txt 20 Aug 2003 06:52:43 - 1.6238
+++ openpkg-web/news.txt 20 Aug 2003 06:54:06 - 1.6239
@@ -1,3 +1,4 @@
+20-Aug-2003: Upgraded package: P
20-Aug-2003: Upgraded package: P
20-Aug-2003: Upgraded package: P
20-Aug-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Aug-2003 08:49:17
Branch: HEAD Handle: 2003080607491501
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Enable third party apps to detect their correct build parameters
according to what libqt was build with ticket #219
Summary:
RevisionChanges Path
1.73+22 -8 openpkg-src/qt/qt.spec
1.6047 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.72 -r1.73 qt.spec
--- openpkg-src/qt/qt.spec29 Jul 2003 14:23:22 - 1.72
+++ openpkg-src/qt/qt.spec6 Aug 2003 06:49:16 - 1.73
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.0
-Release: 20030729
+Release: 20030806
# package options
%option with_pgsqlno
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
-PreReq: OpenPKG, openpkg >= 20030103, X11
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, pkgconfig, gcc
+PreReq: OpenPKG, openpkg >= 20030103, X11, pkgconfig
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -97,6 +97,12 @@
esac
# special trolltech configuration
+CC="%{l_cc}" \
+CXX="%{l_cxx}" \
+CFLAGS="%{l_cflags -O}" \
+CXXFLAGS="%{l_cxxflags -O}" \
+CPPFLAGS="%{l_cppflags}" \
+LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -108,8 +114,8 @@
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
--release -static -stl -sm -qt-zlib \
--qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+-release -static -stl -sm \
+-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-no-thread
@@ -121,6 +127,12 @@
symlinks src-qmake src-moc sub-src sub-tools
# run configure a second time to get threaded libs as well
+CC="%{l_cc}" \
+CXX="%{l_cxx}" \
+CFLAGS="%{l_cflags -O}" \
+CXXFLAGS="%{l_cxxflags -O}" \
+CPPFLAGS="%{l_cppflags}" \
+LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -132,8 +144,8 @@
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
--release -static -stl -sm -qt-zlib \
--qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+-release -static -stl -sm \
+-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-thread
@@ -149,7 +161,7 @@
# make directory structure
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
-$RPM_BUILD_ROOT%{l_prefix}/lib \
+$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig \
$RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man3 \
@@ -188,6 +200,8 @@
tools/designer/designer/images/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/images/
%{l_shtool} install -c -m 644 \
lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib/
+%{l_shtool} install -c -m 644 \
+lib/qt.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
%{l_shtool} install -c -m 644 \
doc/man/man3/*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
%{l_shtool} install -c -m 644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6046 -r1.6047 news.txt
--- openpkg-web/news.txt 5 Aug 2003 18:58:05 - 1.6046
+++ openpkg-web/news.txt 6 Aug 2003 06:49:15 - 1.6047
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P
05-Aug-2003: Upgraded package: P
05-Aug-2003: Upgraded package: P
05-Aug-2003: Upgraded package: P
@@ .
__
The OpenPKG Project
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Jul-2003 13:49:32
Branch: HEAD Handle: 2003072912493101
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Remove obsolete logic and add sql drivers
Summary:
RevisionChanges Path
1.71+3 -8 openpkg-src/qt/qt.spec
1.5898 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.70 -r1.71 qt.spec
--- openpkg-src/qt/qt.spec23 Jul 2003 20:13:31 - 1.70
+++ openpkg-src/qt/qt.spec29 Jul 2003 11:49:32 - 1.71
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.2.0
-Release: 20030723
+Release: 20030729
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
@@ -62,13 +62,6 @@
%prep
%setup -q -n qt-x11-free-%{version}
-# tidy up dirty vendor tarball
-( cd include
- for i in qmotifwidget.h qmotif.h qxtwidget.h qmotifdialog.h; do
- rm -f $i
- done
-) || exit $?
-
%build
# display a warning that this package is a beast
( echo "This package requires about 1.3 GB of temporary disk space and"
@@ -99,6 +92,7 @@
-datadir %{l_prefix}/share/qt/data \
-release -static -stl -sm -qt-zlib \
-qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+-qt-sql-psql -qt-sql-odbc -qt-sql-mysql \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-no-thread
@@ -117,6 +111,7 @@
-datadir %{l_prefix}/share/qt/data \
-release -static -stl -sm -qt-zlib \
-qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+-qt-sql-psql -qt-sql-odbc -qt-sql-mysql \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-thread
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5897 -r1.5898 news.txt
--- openpkg-web/news.txt 29 Jul 2003 10:24:27 - 1.5897
+++ openpkg-web/news.txt 29 Jul 2003 11:49:31 - 1.5898
@@ -1,3 +1,4 @@
+29-Jul-2003: Upgraded package: P
29-Jul-2003: Upgraded package: P
29-Jul-2003: Upgraded package: P
29-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 26-Feb-2003 17:07:48
Branch: HEAD Handle: 2003022616074601
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Make even fatter (but more flexible) by installing plain libraries as
well as multithreaded ones
Summary:
RevisionChanges Path
1.59+20 -3 openpkg-src/qt/qt.spec
1.3462 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.58 -r1.59 qt.spec
--- openpkg-src/qt/qt.spec19 Feb 2003 13:24:14 - 1.58
+++ openpkg-src/qt/qt.spec26 Feb 2003 16:07:47 - 1.59
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.1.1
-Release: 20030218
+Release: 20030226
# package options
%option with_xftno
@@ -87,7 +87,7 @@
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
-static -qt-gif -qt-zlib -platform $oscomp \
--thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+-stl -qt-libpng -qt-libjpeg -qt-libmng \
%if "%{with_xft}" == "yes"
-xft
%else
@@ -97,6 +97,23 @@
# set $HOME to a writable directory for qsettings
HOME=$PWD
%{l_make} %{l_mflags -O} \
+MAKE="%{l_make} %{l_mflags -O}"
+
+# run configure a second time to get threaded libs, too
+echo "yes" | ./configure \
+-prefix %{l_prefix} \
+-docdir %{l_prefix}/share/qt/doc \
+-datadir %{l_prefix}/share/qt/data \
+-static -qt-gif -qt-zlib -platform $oscomp \
+-thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+%if "%{with_xft}" == "yes"
+-xft
+%else
+-no-xft
+%endif
+
+# make our targets a second time to get threaded libs, too
+%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
@@ -115,7 +132,7 @@
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/images
-# copy binaries, headers, and then libraries to their target.
+# copy binaries, headers, and then libraries to their target
%{l_shtool} install -c -s -m 755 \
bin/qmake bin/moc bin/uic \
bin/linguist bin/lrelease bin/lupdate \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3461 -r1.3462 news.txt
--- openpkg-web/news.txt 26 Feb 2003 13:59:48 - 1.3461
+++ openpkg-web/news.txt 26 Feb 2003 16:07:46 - 1.3462
@@ -1,3 +1,4 @@
+26-Feb-2003: Upgraded package: P
26-Feb-2003: Upgraded package: P
26-Feb-2003: New package: P
26-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Feb-2003 14:24:15
Branch: HEAD Handle: 2003021913241301
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
drop README file, clean up packaging a bit
Summary:
RevisionChanges Path
1.58+13 -15 openpkg-src/qt/qt.spec
1.3360 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.57 -r1.58 qt.spec
--- openpkg-src/qt/qt.spec17 Jan 2003 12:19:35 - 1.57
+++ openpkg-src/qt/qt.spec19 Feb 2003 13:24:14 - 1.58
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.1.1
-Release: 20030117
+Release: 20030218
# package options
%option with_xftno
@@ -125,6 +125,12 @@
# copy mkspecs directory for later portable use of qmake
cp -rp mkspecs $RPM_BUILD_ROOT%{l_prefix}/share/qt/
+# correct man suffix
+for man in doc/man/man3/*.3qt; do
+%{l_shtool} subst -e 's;\.3qt;.3;' $man
+mv $man `echo $man | sed -e 's;\.3qt$;.3;'`
+done
+
%{l_shtool} install -c -m 644 \
include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
%{l_shtool} install -c -m 644 \
@@ -137,20 +143,12 @@
tools/linguist/phrasebooks/*.qph
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks/
%{l_shtool} install -c -m 644 \
tools/designer/designer/images/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/images/
-
-( cd lib && tar cf - * ) |\
-( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
-( cd doc/man/man3
- for man in *.3qt; do
- %{l_shtool} subst -e 's;\.3qt;.3;' $man
- mv $man `echo $man | sed -e 's;\.3qt$;.3;'`
- 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_shtool} install -c -m 644 \
+lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib
+%{l_shtool} install -c -m 644 \
+doc/man/man3/*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
+%{l_shtool} install -c -m 644 \
+doc/man/man1/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3359 -r1.3360 news.txt
--- openpkg-web/news.txt 19 Feb 2003 13:09:49 - 1.3359
+++ openpkg-web/news.txt 19 Feb 2003 13:24:13 - 1.3360
@@ -1,3 +1,4 @@
+19-Feb-2003: Upgraded package: P
19-Feb-2003: Upgraded package: P
19-Feb-2003: Upgraded package: P
19-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jan-2003 13:19:35
Branch: HEAD Handle: 2003011712193401
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Fix for non POSIX conformant FreeBSD.
Summary:
RevisionChanges Path
1.57+11 -4 openpkg-src/qt/qt.spec
1.2900 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.56 -r1.57 qt.spec
--- openpkg-src/qt/qt.spec3 Jan 2003 11:40:32 - 1.56
+++ openpkg-src/qt/qt.spec17 Jan 2003 12:19:35 - 1.57
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.1.1
-Release: 20030103
+Release: 20030117
# package options
%option with_xftno
@@ -68,9 +68,16 @@
%build
export QTDIR=`pwd`
case "%{l_target}" in
-*-freebsd* ) oscomp="freebsd-g++" ;;
-*-linux* ) oscomp="linux-g++" ;;
-*-solaris* ) oscomp="solaris-g++" ;;
+*-freebsd* ) oscomp="freebsd-g++"
+ %{l_shtool} subst \
+ -e
's/defined(_POSIX_THREAD_SAFE_FUNCTIONS)/_POSIX_THREAD_SAFE_FUNCTIONS - 0 > 0/g' \
+ src/dialogs/qfiledialog.cpp src/kernel/qfont_x11.cpp \
+ src/tools/qdatetime.cpp src/tools/qdir_unix.cpp
+ ;;
+*-linux* ) oscomp="linux-g++"
+ ;;
+*-solaris* ) oscomp="solaris-g++"
+ ;;
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2899 -r1.2900 news.txt
--- openpkg-web/news.txt 17 Jan 2003 10:47:12 - 1.2899
+++ openpkg-web/news.txt 17 Jan 2003 12:19:34 - 1.2900
@@ -1,3 +1,4 @@
+17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
17-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
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: 03-Jan-2003 12:40:32
Branch: HEAD Handle: 2003010311403101
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
upgrade to new %option world order
Summary:
RevisionChanges Path
1.56+6 -6 openpkg-src/qt/qt.spec
1.2533 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.55 -r1.56 qt.spec
--- openpkg-src/qt/qt.spec3 Jan 2003 10:54:27 - 1.55
+++ openpkg-src/qt/qt.spec3 Jan 2003 11:40:32 - 1.56
@@ -23,9 +23,6 @@
## SUCH DAMAGE.
##
-# package options
-%option with_xftno
-
# package information
Name: qt
Summary: The Qt Toolkit
@@ -36,7 +33,10 @@
Group:XWindow
License: GPL
Version: 3.1.1
-Release: 20021230
+Release: 20030103
+
+# package options
+%option with_xftno
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -44,8 +44,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021230, X11, gcc
-PreReq: OpenPKG, openpkg >= 20021230, X11
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
+PreReq: OpenPKG, openpkg >= 20030103, X11
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2532 -r1.2533 news.txt
--- openpkg-web/news.txt 3 Jan 2003 11:37:52 - 1.2532
+++ openpkg-web/news.txt 3 Jan 2003 11:40:31 - 1.2533
@@ -1,3 +1,4 @@
+03-Jan-2003: New package: P
03-Jan-2003: New package: P
03-Jan-2003: New package: P
03-Jan-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt/ qt.spec openpkg-web/ news.txt
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:
RevisionChanges 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.spec17 Dec 2002 10:54:51 - 1.51
+++ openpkg-src/qt/qt.spec30 Dec 2002 19:48:41 - 1.52
@@ -24,9 +24,7 @@
##
# package options
-%ifndef with_xft
-%define with_xftno
-%endif
+%option with_xftno
# 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 - 1.2450
+++ openpkg-web/news.txt 30 Dec 2002 19:48:40 - 1.2451
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P
30-Dec-2002: Upgraded package: P
30-Dec-2002: Upgraded package: P
30-Dec-2002: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 25-Nov-2002 15:10:36
Branch: HEAD Handle: 2002112514103501
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Workaround for existing Qt libraries problem.
Summary:
RevisionChanges Path
1.49+1 -3 openpkg-src/qt/qt.spec
1.2107 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.48 -r1.49 qt.spec
--- openpkg-src/qt/qt.spec18 Nov 2002 20:11:08 - 1.48
+++ openpkg-src/qt/qt.spec25 Nov 2002 14:10:36 - 1.49
@@ -38,7 +38,7 @@
Group:XWindow
License: GPL
Version: 3.1.0
-Release: 20021118
+Release: 20021125
# list of sources
Source0: ftp://ftp.silug.org/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -101,8 +101,6 @@
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
-static -qt-gif -qt-zlib -platform $oscomp \
--L`%{l_prefix}/etc/rc --query x11_libdir` \
--R`%{l_prefix}/etc/rc --query x11_libdir` \
-thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
%if "%{with_xft}" == "yes"
-xft
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2106 -r1.2107 news.txt
--- openpkg-web/news.txt 25 Nov 2002 12:08:22 - 1.2106
+++ openpkg-web/news.txt 25 Nov 2002 14:10:35 - 1.2107
@@ -1,3 +1,4 @@
+25-Nov-2002: Upgraded package: P
25-Nov-2002: New package: P
25-Nov-2002: Upgraded package: P
24-Nov-2002: New package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 18-Nov-2002 21:11:09
Branch: HEAD Handle: 2002111820110800
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Added stock PNG icons.
Summary:
RevisionChanges Path
1.48+5 -2 openpkg-src/qt/qt.spec
1.2054 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.47 -r1.48 qt.spec
--- openpkg-src/qt/qt.spec14 Nov 2002 14:01:14 - 1.47
+++ openpkg-src/qt/qt.spec18 Nov 2002 20:11:08 - 1.48
@@ -38,7 +38,7 @@
Group:XWindow
License: GPL
Version: 3.1.0
-Release: 20021114
+Release: 20021118
# list of sources
Source0: ftp://ftp.silug.org/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -129,7 +129,8 @@
$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/phrasebooks
+$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
+$RPM_BUILD_ROOT%{l_prefix}/share/qt/images
# copy binaries, headers, and then libraries to their target.
%{l_shtool} install -c -s -m 755 \
@@ -151,6 +152,8 @@
tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
%{l_shtool} install -c -m 644 \
tools/linguist/phrasebooks/*.qph
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks/
+%{l_shtool} install -c -m 644 \
+tools/designer/designer/images/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/images/
( cd lib && tar cf - * ) |\
( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2053 -r1.2054 news.txt
--- openpkg-web/news.txt 18 Nov 2002 19:27:33 - 1.2053
+++ openpkg-web/news.txt 18 Nov 2002 20:11:08 - 1.2054
@@ -1,3 +1,4 @@
+18-Nov-2002: Upgraded package: P
18-Nov-2002: Upgraded package: P
18-Nov-2002: Upgraded package: P
18-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 14-Nov-2002 15:01:15
Branch: HEAD Handle: 2002111414011103
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Integrate Trolltech's qt_windows fix, add new phrasebooks, and sort config
arguments.
Summary:
RevisionChanges Path
1.47+14 -14 openpkg-src/qt/qt.spec
1.2022 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.46 -r1.47 qt.spec
--- openpkg-src/qt/qt.spec13 Nov 2002 14:24:43 - 1.46
+++ openpkg-src/qt/qt.spec14 Nov 2002 14:01:14 - 1.47
@@ -38,7 +38,7 @@
Group:XWindow
License: GPL
Version: 3.1.0
-Release: 20021113
+Release: 20021114
# list of sources
Source0: ftp://ftp.silug.org/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -97,20 +97,18 @@
# special trolltech configuration
echo "yes" | ./configure \
--prefix %{l_prefix} -release \
+-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
--static -qt-gif -qt-zlib \
--platform $oscomp -thread -stl \
--qt-libpng -qt-libjpeg -qt-libmng \
--no-nas-sound -no-tablet -no-xkb \
+-datadir %{l_prefix}/share/qt/data \
+-static -qt-gif -qt-zlib -platform $oscomp \
+-L`%{l_prefix}/etc/rc --query x11_libdir` \
+-R`%{l_prefix}/etc/rc --query x11_libdir` \
+-thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
%if "%{with_xft}" == "yes"
--xft \
+-xft
%else
--no-xft \
+-no-xft
%endif
--sm -xinerama -xrender \
--L`%{l_prefix}/etc/rc --query x11_libdir` \
--R`%{l_prefix}/etc/rc --query x11_libdir`
# set $HOME to a writable directory for qsettings
HOME=$PWD
@@ -130,7 +128,8 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$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/templates \
+$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks
# copy binaries, headers, and then libraries to their target.
%{l_shtool} install -c -s -m 755 \
@@ -142,8 +141,6 @@
# copy mkspecs directory for later portable use of qmake
cp -rp mkspecs $RPM_BUILD_ROOT%{l_prefix}/share/qt/
-# qt_windows.h is the only header not copied in the original distribution.
-rm -f include/qt_windows.h
%{l_shtool} install -c -m 644 \
include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
%{l_shtool} install -c -m 644 \
@@ -152,6 +149,9 @@
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/
+%{l_shtool} install -c -m 644 \
+tools/linguist/phrasebooks/*.qph
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks/
+
( cd lib && tar cf - * ) |\
( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
( cd doc/man/man3
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2021 -r1.2022 news.txt
--- openpkg-web/news.txt 14 Nov 2002 08:55:22 - 1.2021
+++ openpkg-web/news.txt 14 Nov 2002 14:01:11 - 1.2022
@@ -1,3 +1,4 @@
+14-Nov-2002: Upgraded package: P
14-Nov-2002: Upgraded package: P
14-Nov-2002: Upgraded package: P
14-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
On Tue, Nov 05, 2002, Ralf S. Engelschall wrote: > On Tue, Nov 05, 2002, Michael Schloh wrote: > >> Remove freetype option. >> [...] > > I'm just wondering: what is the reason? Doesn't it work? > I've had only problems with Qt + Freetype under both Solaris and FreeBSD, so I finally decided to take it out. This was a similar decision as libpng and libjpeg, both of which are now built only out of the native Qt distribution. Its not to say that it won't work some day. If anybody with more Freetype experience with me is willing to investigate, then its probably some hard-coded linking statement in the Qt (non-autoconf) build configuration. -- [EMAIL PROTECTED] Development Team, Application Services Cable & Wireless Deutschland GmbH msg02189/pgp0.pgp Description: PGP signature
Re: [CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
On Tue, Nov 05, 2002, Michael Schloh wrote: > Remove freetype option. > [...] I'm just wondering: what is the reason? Doesn't it work? Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 05-Nov-2002 19:29:01
Branch: HEAD Handle: 200211051829
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Remove freetype option.
Summary:
RevisionChanges Path
1.44+2 -19 openpkg-src/qt/qt.spec
1.1950 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.43 -r1.44 qt.spec
--- openpkg-src/qt/qt.spec23 Oct 2002 16:24:19 - 1.43
+++ openpkg-src/qt/qt.spec5 Nov 2002 18:29:00 - 1.44
@@ -23,11 +23,6 @@
## SUCH DAMAGE.
##
-# package options
-%ifndefwith_freetype
-%definewith_freetypeno
-%endif
-
# package information
Name: qt
Summary: The Qt Toolkit
@@ -38,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.0.6
-Release: 20021023
+Release: 20021105
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -48,10 +43,6 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, X11, gcc
PreReq: OpenPKG, openpkg >= 20020206, X11
-%if "%{with_freetype}" == "yes"
-BuildPreReq: freetype
-PreReq: freetype
-%endif
AutoReq: no
AutoReqProv: no
@@ -68,9 +59,6 @@
similar to templates in C++, but with influences from component
technology.
-Options:
---define 'with_freetype %{with_freetype}'
-
%prep
%setup -q -n qt-x11-free-%{version}
@@ -89,12 +77,7 @@
-static -qt-gif -qt-zlib \
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
--no-nas-sound -no-tablet -no-xkb \
-%if "%{with_freetype}" == "yes"
--xft \
-%else
--no-xft \
-%endif
+-no-nas-sound -no-tablet -no-xkb -no-xft \
-sm -xinerama -xrender \
-L`%{l_prefix}/etc/rc --query x11_libdir` \
-R`%{l_prefix}/etc/rc --query x11_libdir`
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1949 -r1.1950 news.txt
--- openpkg-web/news.txt 5 Nov 2002 16:44:46 - 1.1949
+++ openpkg-web/news.txt 5 Nov 2002 18:29:00 - 1.1950
@@ -1,3 +1,4 @@
+05-Nov-2002: Upgraded package: P
05-Nov-2002: Upgraded package: P
05-Nov-2002: Upgraded package: P
05-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 23-Oct-2002 18:24:19
Branch: HEAD Handle: 2002102317241801
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
upgrading package: qt 3.0.5 -> 3.0.6
Summary:
RevisionChanges Path
1.43+2 -2 openpkg-src/qt/qt.spec
1.1874 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.42 -r1.43 qt.spec
--- openpkg-src/qt/qt.spec22 Oct 2002 09:51:14 - 1.42
+++ openpkg-src/qt/qt.spec23 Oct 2002 16:24:19 - 1.43
@@ -37,8 +37,8 @@
Distribution: OpenPKG [EVAL]
Group:XWindow
License: GPL
-Version: 3.0.5
-Release: 20021022
+Version: 3.0.6
+Release: 20021023
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1873 -r1.1874 news.txt
--- openpkg-web/news.txt 23 Oct 2002 12:40:39 - 1.1873
+++ openpkg-web/news.txt 23 Oct 2002 16:24:18 - 1.1874
@@ -1,3 +1,4 @@
+23-Oct-2002: Upgraded package: P
23-Oct-2002: Upgraded package: P
23-Oct-2002: Security Advisory: S
23-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 04-Oct-2002 11:27:21
Branch: HEAD Handle: 2002100410272001
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Put X11 paths back in to guarantee cross-platform link consistency.
Summary:
RevisionChanges Path
1.35+4 -2 openpkg-src/qt/qt.spec
1.1689 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.34 -r1.35 qt.spec
--- openpkg-src/qt/qt.spec3 Oct 2002 21:32:49 - 1.34
+++ openpkg-src/qt/qt.spec4 Oct 2002 09:27:21 - 1.35
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.0.5
-Release: 20021003
+Release: 20021004
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -76,7 +76,9 @@
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
-no-nas-sound -no-tablet -no-xkb \
--xft -sm -xinerama -xrender
+-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} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1688 -r1.1689 news.txt
--- openpkg-web/news.txt 3 Oct 2002 21:32:48 - 1.1688
+++ openpkg-web/news.txt 4 Oct 2002 09:27:20 - 1.1689
@@ -1,3 +1,4 @@
+04-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
On Thu, Oct 03, 2002, Michael Schloh wrote:
> [...]
> Fixed rebuilding redundant path problem.
> [...]
> --xft -sm -xinerama -xrender \
> --I%{l_prefix}/include \
> --L%{l_prefix}/lib \
> --R%{l_prefix}/lib \
> --L`%{l_prefix}/etc/rc --query x11_libdir` \
> --R`%{l_prefix}/etc/rc --query x11_libdir`
> +-xft -sm -xinerama -xrender
> [...]
Yes, perhaps Qt itself finds your X11 paths on your particular OS. But
it would be good that it uses _the_ X11 which OpenPKG discovered (and
which is used in other packages, too). So I wouldn't remove at least
the...
-L`%{l_prefix}/etc/rc --query x11_libdir` \
-R`%{l_prefix}/etc/rc --query x11_libdir`
Because I don't think we can be sure that Qt always selects the same
X11 as OpenPKG in case there are multiple instances of X11 found (like
Openwin vs. plain X11R6).
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 03-Oct-2002 23:32:49
Branch: HEAD Handle: 2002100322324801
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Fixed rebuilding redundant path problem.
Summary:
RevisionChanges Path
1.34+2 -7 openpkg-src/qt/qt.spec
1.1688 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.33 -r1.34 qt.spec
--- openpkg-src/qt/qt.spec30 Sep 2002 11:50:37 - 1.33
+++ openpkg-src/qt/qt.spec3 Oct 2002 21:32:49 - 1.34
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.0.5
-Release: 20020930
+Release: 20021003
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -76,12 +76,7 @@
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
-no-nas-sound -no-tablet -no-xkb \
--xft -sm -xinerama -xrender \
--I%{l_prefix}/include \
--L%{l_prefix}/lib \
--R%{l_prefix}/lib \
--L`%{l_prefix}/etc/rc --query x11_libdir` \
--R`%{l_prefix}/etc/rc --query x11_libdir`
+-xft -sm -xinerama -xrender
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1687 -r1.1688 news.txt
--- openpkg-web/news.txt 3 Oct 2002 18:20:15 - 1.1687
+++ openpkg-web/news.txt 3 Oct 2002 21:32:48 - 1.1688
@@ -1,3 +1,4 @@
+03-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
03-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 30-Sep-2002 13:50:38
Branch: HEAD Handle: 2002093012503601
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Remove extra uneeded crap.
Summary:
RevisionChanges Path
1.33+2 -5 openpkg-src/qt/qt.spec
1.1656 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.32 -r1.33 qt.spec
--- openpkg-src/qt/qt.spec27 Sep 2002 13:54:35 - 1.32
+++ openpkg-src/qt/qt.spec30 Sep 2002 11:50:37 - 1.33
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.0.5
-Release: 20020927
+Release: 20020930
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -63,10 +63,7 @@
%setup -q -n qt-x11-free-%{version}
%build
-QTDIR=`pwd`
-PATH="$QTDIR/bin:$PATH"
-LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export QTDIR PATH LD_LIBRARY_PATH
+export QTDIR=`pwd`
case "%{l_target}" in
*-freebsd* ) oscomp="freebsd-g++" ;;
*-linux* ) oscomp="linux-g++" ;;
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1655 -r1.1656 news.txt
--- openpkg-web/news.txt 30 Sep 2002 07:06:31 - 1.1655
+++ openpkg-web/news.txt 30 Sep 2002 11:50:36 - 1.1656
@@ -1,3 +1,4 @@
+30-Sep-2002: Upgraded package: P
30-Sep-2002: Upgraded package: P
30-Sep-2002: Upgraded package: P
29-Sep-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/qt qt.spec openpkg-web news.txt
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 26-Aug-2002 11:38:01
Branch: HEAD Handle: 2002082610380001
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
downgrade, makes trouble
Summary:
RevisionChanges Path
1.30+2 -2 openpkg-src/qt/qt.spec
1.1413 +1 -0 openpkg-web/news.txt
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.29 -r1.30 qt.spec
--- openpkg-src/qt/qt.spec13 Aug 2002 12:49:37 - 1.29
+++ openpkg-src/qt/qt.spec26 Aug 2002 09:38:01 - 1.30
@@ -29,11 +29,11 @@
URL: http://www.trolltech.com/products/qt/x11.html
Vendor: TrollTech AS
Packager: The OpenPKG Project
-Distribution: OpenPKG [PLUS]
+Distribution: OpenPKG [EVAL]
Group:XWindow
License: GPL
Version: 3.0.4
-Release: 20020625
+Release: 20020826
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1412 -r1.1413 news.txt
--- openpkg-web/news.txt 26 Aug 2002 09:20:35 - 1.1412
+++ openpkg-web/news.txt 26 Aug 2002 09:38:00 - 1.1413
@@ -1,3 +1,4 @@
+26-Aug-2002: Upgraded package: P
26-Aug-2002: Upgraded package: P
26-Aug-2002: Upgraded package: P
26-Aug-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
