SPECS (qt-copy): qt.spec - Updated to 050602 snap - Switched to th...
adgor
adgor at pld-linux.org
Mon Jul 4 08:46:39 CEST 2005
Author: adgor Date: Mon Jul 4 06:46:39 2005 GMT
Module: SPECS Tag: qt-copy
---- Log message:
- Updated to 050602 snap
- Switched to the qt-copy branch
---- Files affected:
SPECS:
qt.spec (1.341 -> 1.341.2.1)
---- Diffs:
================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.341 SPECS/qt.spec:1.341.2.1
--- SPECS/qt.spec:1.341 Wed May 11 17:27:01 2005
+++ SPECS/qt.spec Mon Jul 4 08:46:33 2005
@@ -11,37 +11,34 @@
%bcond_without pgsql # don't build PostgreSQL plugin
%bcond_without designer # don't build designer (it takes long)
%bcond_without sqlite # don't build SQLite plugin
-%bcond_with ibase # build ibase (InterBase/Firebird) plugin
-%bcond_with pch # enable pch in qmake
+%bcond_without ibase # build ibase (InterBase/Firebird) plugin
+%bcond_without pch # do not use precompiled header support
#
-%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
+%ifnarch %{ix86} amd64 sparc sparcv9 alpha ppc
%undefine with_ibase
%endif
%define _withsql 1
%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}
%define _ver 3.3.4
+%define _snap 050602
Summary: The Qt3 GUI application framework
Summary(es): Biblioteca para ejecutar aplicaciones GUI Qt
Summary(pl): Biblioteka Qt3 do tworzenia GUI
Summary(pt_BR): Estrutura para rodar aplicaçőes GUI Qt
Name: qt
-Version: %{_ver}
-Release: 3
+Version: %{_ver}.%{_snap}
+Release: 1
Epoch: 6
License: GPL/QPL
Group: X11/Libraries
-#Source0: http://ep09.pld-linux.org/~%{_packager}/kde/%{name}-copy-%{_snap}.tar.bz2
-Source0: ftp://ftp.trolltech.com/qt/source/%{name}-x11-free-%{version}.tar.bz2
-# Source0-md5: 027f4e82fbe592b39d2f160bfb3a73af
-Source1: http://ftp.pld-linux.org/software/kde/%{name}-copy-patches-040819.tar.bz2
-# Source1-md5: f35f461463d89f7b035530d8d1f02ad6
+Source0: http://ftp.pld-linux.org/software/kde/%{name}-copy-%{_snap}.tar.bz2
+##% Source0-md5: 20ad0c23d8c78889565efbd934e52c96
Source2: %{name}config.desktop
Source3: designer.desktop
Source4: assistant.desktop
Source5: linguist.desktop
-Source6: %{name}-apply_patches.sh
Source7: designer.png
Source8: assistant.png
Source9: linguist.png
@@ -54,16 +51,15 @@
Patch6: %{name}-qmake-opt.patch
Patch7: %{name}-locale-charmap.patch
Patch8: %{name}-gcc34.patch
-Patch9: %{name}-support-cflags-with-commas.patch
-# for troll only
+Patch9: %{name}-support-cflags-with-commas.patch
Patch10: %{name}-antialias.patch
-#
Patch12: %{name}-x11-free-quiet.patch
-Patch13: %{name}-x11-mono.patch
-Patch14: %{name}-x11-qfontdatabase_x11.patch
+#Patch13: %{name}-x11-mono.patch
+#Patch14: %{name}-x11-qfontdatabase_x11.patch
+#Patch15: %{name}-copy-q_export_plugin.patch
URL: http://www.trolltech.com/products/qt/
Icon: qt.xpm
-%{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0}
+%{?with_ibase:BuildRequires: Firebird-devel}
BuildRequires: OpenGL-devel
%{?with_nvidia:BuildRequires: X11-driver-nvidia-devel >= 1.0.6111-2}
%{?with_cups:BuildRequires: cups-devel}
@@ -80,10 +76,12 @@
BuildRequires: perl-base
%{?with_pgsql:BuildRequires: postgresql-backend-devel}
%{?with_pgsql:BuildRequires: postgresql-devel}
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.167
BuildRequires: sed >= 4.0
-%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_odbc:BuildRequires: unixODBC-devel}
+# There is an internal sqlite copy used to
+# build this plugin - TODO
+#%{?with_sqlite:BuildRequires: sqlite-devel}
BuildRequires: xcursor-devel
BuildRequires: xft-devel
BuildRequires: xrender-devel
@@ -659,7 +657,7 @@
graficznego - Qt Designer.
%prep
-%setup -q -n %{name}-x11-free-%{version} -a1
+%setup -q -n %{name}-copy-%{_snap}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -672,15 +670,11 @@
%patch9 -p1
%patch10 -p1
%patch12 -p1
-%patch13 -p1
-%patch14 -p1
+#%patch13 -p1
+#%patch14 -p1
+#%patch15 -p1
-install %{SOURCE6} ./apply_patches
-chmod +x ./apply_patches
-# patch 0021 currently applied in 3.3.4 release
-rm patches/0021-qiconview-dragalittle.patch
./apply_patches
-rm ../.qt-x11-free-%{version}.applied
# change QMAKE_CFLAGS_RELEASE to build
# properly optimized libs
@@ -720,7 +714,7 @@
# pass OPTFLAGS to build qmake itself with optimization
export OPTFLAGS="%{rpmcxxflags}"
-#%{__make} -f Makefile.cvs
+%{__make} -f Makefile.cvs
##################################
# DEFAULT OPTIONS FOR ALL BUILDS #
@@ -904,7 +898,7 @@
done
cd -
-##make -C extensions/nsplugin/src
+#%%{__make} -C extensions/nsplugin/src
%install
rm -rf $RPM_BUILD_ROOT
@@ -1000,6 +994,7 @@
install translations/qt_ru.qm $RPM_BUILD_ROOT%{_datadir}/locale/ru/LC_MESSAGES/qt.qm
install translations/qt_sk.qm $RPM_BUILD_ROOT%{_datadir}/locale/sk/LC_MESSAGES/qt.qm
+
%if %{with designer}
install tools/designer/designer/designer_de.qm $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/designer.qm
install tools/designer/designer/designer_fr.qm $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/designer.qm
@@ -1253,502 +1248,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.341 2005/05/11 15:27:01 qboosh
-- use x8664 macro
-
-Revision 1.340 2005/05/03 20:40:44 pluto
-- release 3 for Th.
-
-Revision 1.339 2005/05/03 00:37:12 mmazur
-- Firebird's code looks like crap and gcc4 doesn't like it; disabling firebird
- support
-
-Revision 1.338 2005/04/13 15:36:06 pluto
-- configure/sed fixed (now it works fine with commas in cflags).
-
-Revision 1.337 2005/02/26 13:55:01 qboosh
-- clean builddir after apply_patches
-
-Revision 1.336 2005/02/12 22:50:00 arekm
-- rel ++
-
-Revision 1.335 2005/01/27 17:30:40 wolf
-- 3.3.4 (pluto)
-
-Revision 1.334 2004/12/30 00:06:43 pluto
-- release 7.
-
-Revision 1.333 2004/12/25 17:58:34 qboosh
-- -devel R: zlib-devel
-
-Revision 1.332 2004/12/15 23:46:22 qboosh
-- rpmcxxflags BR: macros 1.167 (NOTE: not backported to AC-branch)
-
-Revision 1.331 2004/12/15 09:13:03 pluto
-- USING_PCH is obsolete (now ./configure takes -pch switch).
-
-Revision 1.330 2004/12/15 09:07:16 pluto
-- use cxx optflags.
-
-Revision 1.329 2004/11/13 16:49:22 adgor
-- Fixed %%files (designer)
-
-Revision 1.328 2004/11/13 10:16:54 ankry
-- rel. 6
-
-Revision 1.327 2004/11/12 18:00:27 adgor
-- Added icons for assistant, designer & linguist
-
-Revision 1.326 2004/11/11 01:49:02 ankry
-- rel. 5
-
-Revision 1.325 2004/10/31 20:54:09 paladine
-- spaces->tabs
-- formatting
-
-Revision 1.324 2004/10/28 12:42:31 paladine
-- "PostgreSQL" unification
-
-Revision 1.323 2004/10/25 10:58:19 qboosh
-- there is Firebird-devel on alpha now
-
-Revision 1.322 2004/09/17 10:54:11 qboosh
-- typo
-
-Revision 1.321 2004/09/17 10:47:30 saq
-- merged banner into %%description
-- updated es description, volunteers to fix pt_BR?
-
-Revision 1.320 2004/09/14 13:59:15 saq
-- locale-charmap.patch: fix locale handling on locales whose implicit
- charmap isn't UTF-8
-
-Revision 1.319 2004/08/28 14:29:51 gozda
-- Changed to enable building with X11 nvidia drivers.
-- djurban said building with nvidia is not needed, but if it doesn't do any harm, why not?
-
-Revision 1.318 2004/08/26 22:49:30 djurban
-- rel. 4 rebuild alone, then send kdelibs to pickit up
-
-Revision 1.317 2004/08/26 20:21:45 qboosh
-- duplicating random subset of (now automatically generated) non-versioned
- package names dependencies doesn't make any sense - disabled;
- added some versioned deps instead (where appropriate)
-
-Revision 1.316 2004/08/26 19:11:24 djurban
-- rel. 3, rebuild, should fix the problems.
-
-Revision 1.315 2004/08/26 16:28:35 havner
-- rel 2, rebuild it once again against this QProgressBar
-
-Revision 1.314 2004/08/24 15:26:28 pluto
-- %%files(devel) += libqt-mt.la
-
-Revision 1.313 2004/08/23 17:12:32 qboosh
-- strict deps where appropriate, unified Qt capitalization
-
-Revision 1.312 2004/08/23 12:26:56 pluto
-- pch enabled.
-
-Revision 1.311 2004/08/23 11:47:45 pluto
-- cleanup.
-
-Revision 1.310 2004/08/20 21:41:09 djurban
-- libungif not r:, since statically linked
-
-Revision 1.309 2004/08/20 21:34:28 djurban
-- add requires, fix qmake, now stbr
-
-Revision 1.308 2004/08/20 20:53:18 djurban
-- rel. 1 stbr
-
-Revision 1.307 2004/08/20 17:31:59 djurban
-- fix md5 before i kill somebody
-
-Revision 1.306 2004/08/20 17:31:05 djurban
-- FIIIIIIIIIIIIIIIIIIIIIIXXXXXXXXXXXXXXXXXXXXXXXXXX Source1.
-
-Revision 1.305 2004/08/20 17:11:11 djurban
-- updated to 3.3.3
-
-Revision 1.304 2004/08/18 22:00:42 qboosh
-- added amd64 to archs with Firebird support
-
-Revision 1.303 2004/07/31 07:39:16 qboosh
-- yacc is no longer needed for qt releases
-
-Revision 1.302 2004/06/27 20:58:32 arekm
-- rel 6
-
-Revision 1.301 2004/06/27 18:49:59 arekm
-- rel 5.1
-- use __cc and __cxx for compilation
-- do not complain about ,,QPixmap: Cannot create a QPixmap when no GUI is being used''
-- other fixes (from FC), going into testing
-
-Revision 1.300 2004/05/30 22:52:10 djurban
-- dont br qmake
-
-Revision 1.299 2004/05/30 22:51:21 djurban
-- updated qt-copy-patches, fix build loop, rel. 5 (building now on betanet if works->ac and will be base for kde 3.2.3
-
-Revision 1.298 2004/05/30 00:58:52 qboosh
-- enabled ibase by default (on supported archs)
-- finished versioned -sql-plugin Provides
-
-Revision 1.297 2004/05/29 19:23:29 djurban
-- moving examples makefile generation to %install as qboosh suggested
-
-Revision 1.296 2004/05/27 22:07:07 qboosh
-- macros are not supported in Icon
-
-Revision 1.295 2004/05/26 21:45:59 djurban
-- qt icon added
-
-Revision 1.294 2004/05/26 21:22:56 djurban
-- get rid of waring ins %post
-
-Revision 1.293 2004/05/26 21:10:36 djurban
-- fix obsoletes/designer req
-
-Revision 1.292 2004/05/26 18:38:30 djurban
-- usability fixes in descriptions
-- proper Makefile generation for examples/tutorials (reported by patrys this morning)
-- separated: qmake, qt-assistant, qt-linguist removed qt-utils
-- last TODO: make a working way for qt assistant to sync with qsa, two ways to do it:
- 1. via the default profile (which means if you have an old profile and install qsa you wont have it in assistant)
- 2. with an external script which would add it (and an info in %post qsa-doc) (tell me what is better)
-
-Revision 1.291 2004/05/26 13:33:07 djurban
-- rel. 3 added desktop files for assistant/linguist
-- removed assistant_use_global_docs aptch which never worked
-- removed qsa support which was never really supported in PLD, its
- buildsystem is shit (a c++ configure app installig stuff to /usr)
-- fixed Antialiasing bug reported by twittner
-- TODO: usability in descriptions (dont stbr yet)
-
-Revision 1.290 2004/05/25 20:43:39 djurban
-- add fix for antialiasing control by qt/kde
-
-Revision 1.289 2004/05/13 17:43:07 ankry
-- spaces -> tabs, other cosmetics
-
-Revision 1.288 2004/05/05 11:00:10 adgor
-- Ops.. %%post for main already exists
-
-Revision 1.287 2004/05/05 10:32:56 adgor
-- %%post for main; cleanups
-
-Revision 1.286 2004/05/04 15:43:39 qboosh
-- run ldconfig in -designer-libs post/postun
-- really no need to duplicate autogenerated deps in plugings, cosmetics
-
-Revision 1.285 2004/05/04 11:08:08 djurban
-- Wrote: /home/users/djurban/rpm/RPMS/qt-3.3.2-1.8.pentium4.rpm
-- rel. 2
-- renumerated patche (mysql/pgsql include fixes removed)
-- STBRing for ac.
-
-Revision 1.284 2004/05/04 09:53:10 pluto
-- pch_devel: path fixed.
-
-Revision 1.283 2004/05/04 09:50:31 pluto
-- bcond pch_devel added (experimental boost for the developers).
-
-Revision 1.282 2004/05/03 21:38:47 adgor
-- Removed includedir redefinition
+Revision 1.341.2.1 2005/07/04 06:46:33 adgor
+- Updated to 050602 snap
+- Switched to the qt-copy branch
+
+Revision 1.329.2.2 2005/02/08 18:53:01 adgor
+- 3.3.4.050208
+- Cutting changelog
- Cosmetics
-Revision 1.281 2004/05/03 21:27:36 djurban
-- br devels
-
-Revision 1.280 2004/05/03 21:26:52 djurban
-- more br
-
-Revision 1.279 2004/05/03 21:24:59 djurban
-- s/includedir/prefix/include. someone deifined includedir as prefic/include/qt
-
-Revision 1.278 2004/05/03 21:22:12 djurban
-- another way to fix mysql/postgres includes, disable patch1/2
-
-Revision 1.277 2004/05/03 20:26:39 djurban
-- fix --without designer
-- add sqlite plugin
-- add ibase plugin, disabled for now, wanna use it -> update Firebird.spec,
- which now grants us with ICE with gcc 3.3
-- added necessary reqs to sqldrivers
-- rel 1.8, building it now on alien
-
-Revision 1.276 2004/04/27 18:10:03 adgor
-- Added external qtconfig & designer desktop files
-
-Revision 1.275 2004/04/27 14:03:56 adgor
-- Added current patchset from qt-copy
-- Added autodetect-pch.patch
-
-Revision 1.274 2004/04/27 12:58:15 djurban
-- enable pch in qmake in bcond (--with pch enables it)
-
-Revision 1.273 2004/04/27 12:51:40 qboosh
-- yet again: use optflags when building qmake itself
-
-Revision 1.272 2004/04/27 12:24:31 pluto
-- cvs stuff disabled.
-
-Revision 1.271 2004/04/27 12:21:06 pluto
-- updated to 3.3.2
-
-Revision 1.270 2004/04/25 19:19:49 adgor
-- May be built with each OpenGL
-
-Revision 1.269 2004/04/25 15:30:25 pluto
-- minior oGL fix.
-
-Revision 1.268 2004/04/25 15:13:05 pluto
-- X11(x.org).
-- fixed obsoletes.
-
-Revision 1.267 2004/04/24 08:50:39 pluto
-- fixed BR:, now it works fine with xfree86/xorg/xlibs.
-
-Revision 1.266 2004/04/22 13:00:27 adgor
-- 04042 (some fixes for kde-3.2.2)
-
-Revision 1.265 2004/04/21 17:08:52 qboosh
-- fixed cut bcond desc
-
-Revision 1.264 2004/04/21 15:03:34 adgor
-- Misc improvements
-- Release 2
-
-Revision 1.263 2004/04/13 12:42:45 djurban
-- updated to 040412 (new patch)
-- properly subpackaged dsigner, now the without designer bcond is useful,
- n order to make use of t buidl this version with designer and install
- designer-* subpackages and then you will be able to build next version without
- designer and upgrade them without problms
-
-Revision 1.262 2004/04/06 23:27:28 arekm
-- call make by macro
-
-Revision 1.261 2004/04/06 23:22:08 arekm
-- merged DEVEL
-
-Revision 1.260 2004/03/28 16:32:53 adasi
- - relup to rebuild on Ac builders
- - current build seems to have altivec ops on PPC
-
-Revision 1.259 2004/03/27 01:51:57 adgor
-- Added plugins-mt/crypto dir
-- Fixed designer bcond
-
-Revision 1.258 2004/02/16 14:04:48 pluto
-- another gcc34 fix.
-
-Revision 1.257 2004/02/16 11:53:18 pluto
-- g++ 3.4 fix: clean namespace is now required !
- g++ is now much closer to full conformance to the iso/ansi c++ standard.
- this means, among other things, that a lot of invalid constructs which
- used to be accepted in previous versions will now be rejected.
- it is very likely that existing c++ code will need to be fixed.
-
-Revision 1.256 2004/02/08 13:02:37 pluto
-- fixed BR:
-
-Revision 1.255 2004/02/07 23:48:04 qboosh
-- BR: sed 4.0
-
-Revision 1.254 2004/02/07 16:21:16 djurban
-- merge qt from devel it seems they fixed most bugs, only kjofol sucks at the moment
- but it will be fixed on branch in the next weeks
-- rel. 2
-- added Hausmanns patch from qt-copy that speeds up qtexteditor a bit
-- this will go to ac if it builds...
-
-Revision 1.247.2.32 2004/04/04 16:36:12 djurban
-- fix build without designer
-
-Revision 1.247.2.31 2004/04/04 00:03:28 adgor
-- 040404
-
-Revision 1.247.2.30 2004/03/28 19:53:14 arekm
-- switch xlibs bcond
-
-Revision 1.247.2.29 2004/03/27 01:53:03 adgor
-- Fixed designer bcond
-
-Revision 1.247.2.28 2004/03/27 01:43:13 adgor
-- Added plugins-mt/crypto dir
-
-Revision 1.247.2.27 2004/03/27 00:03:46 adgor
-- Added tiny-qstring-speedup.patch (by Dirk Mueller)
-- Release 2
-
-Revision 1.247.2.26 2004/03/25 12:43:46 adgor
-- 040325
-
-Revision 1.247.2.25 2004/03/23 15:41:14 adgor
-- Added qrichtext-fix-strike-out.patch
-- Release 3
-
-Revision 1.247.2.24 2004/03/18 00:53:51 arekm
-- xfree86 bcond
-
-Revision 1.247.2.23 2004/03/10 20:53:53 pluto
-- removed redudant BR:, release 2.
-
-Revision 1.247.2.22 2004/03/05 14:04:40 pluto
-- gcc 3.4 fixes.
-
-Revision 1.247.2.21 2004/03/05 11:37:56 adgor
-- Grr... 040305
-
-Revision 1.247.2.20 2004/03/04 18:46:24 adgor
-- Builds; release 1
-
-Revision 1.247.2.19 2004/03/04 17:09:08 adgor
-- and more ...
-
-Revision 1.247.2.18 2004/03/04 17:05:14 adgor
-- Some new BR
-
-Revision 1.247.2.17 2004/03/04 15:23:58 adgor
-- ver 0.1
-
-Revision 1.247.2.16 2004/03/04 15:23:05 adgor
-- Started update to 3.3.1. Don't know whether it builds
-
-Revision 1.247.2.15 2004/02/08 00:06:18 adgor
-- Merged qboosh changes from head
-
-Revision 1.247.2.14 2004/02/07 19:32:35 adgor
-- 040207
-
-Revision 1.247.2.13 2004/02/05 17:15:13 adgor
-- 040205 - 3.3.0 final + kde patches
-
-Revision 1.247.2.12 2004/02/03 13:18:31 adgor
-- Updatyed to current (040203) snap
-
-Revision 1.247.2.11 2004/01/23 10:50:29 adgor
-- Reverted bcond name
-- Fixed %%install
-- Switched to new tarball, so patch 10 removed
-- Release 3
-
-Revision 1.247.2.10 2004/01/22 20:02:40 djurban
-- added a patch by Lubos Lunak to fix KDE #61412 bug
-- it was added to qt-copy but I wont regenerate the tarball for one stupid file
-- rel2
-
-Revision 1.247.2.9 2004/01/22 17:37:13 djurban
-- updated to 040122 (this is required if you are planning to use kde 3.2 final)
-- bcond static_libs->static (who's idea was static_libs anyway?)
-- bcond_without designer, because designer hardly ever changes in snaps and
- compiling it takes more time than libqt
-- added cs,sk translations
-
-Revision 1.247.2.8 2004/01/10 11:56:53 adgor
-- Fixed br
-
-Revision 1.247.2.7 2004/01/08 20:59:08 adgor
-- Removed obsoleted patrch entry
-- Added BR for with nvidia bcond
-- Added designer.desktop
-- Release 1
-
-Revision 1.247.2.6 2004/01/04 14:04:13 adgor
-- commented out patch10 (djurban - do not tease me!!)
-
-Revision 1.247.2.5 2004/01/03 19:08:57 djurban
-- I have no idea if it builts, but what the heck, it doesnt have to work
-- updated to 040103
-- nptl fixes from gentoo
-- pkgconfig&la patch is back
-- added -ipv6
-
-Revision 1.247.2.4 2003/12/22 12:35:11 adgor
-- Updated to 031221 snap (qt-3.3.0)
-- Updated postgresql_7_2 & qmake-nostatic patches
-- Added with_nvidia bcond (broken at this moment)
-- qmake-la-and-pc-fix.patch or similar 0029 kde patch does not apply (needs
- checkout)
-- Fixed %%install & %%files
-- Release 0.%%{_snap}.0.1
-
-Revision 1.247.2.3 2003/12/05 17:37:04 adgor
-- Fixed req for qtconfig
-- Release 3
-
-Revision 1.247.2.2 2003/12/05 02:12:04 adgor
-- Separated qtconfig
-- Release 2
-
-Revision 1.247.2.1 2003/11/23 01:47:19 adgor
-- 031122 qt-copy snap
-
-Revision 1.247 2003/11/16 21:59:09 qboosh
-- fixed patches archive md5, bcond standardization (s/static/&_libs/)
-
-Revision 1.247.2.13 2004/02/05 17:15:13 adgor
-- 040205 - 3.3.0 final + kde patches
-
-Revision 1.247.2.12 2004/02/03 13:18:31 adgor
-- Updatyed to current (040203) snap
-
-Revision 1.247.2.11 2004/01/23 10:50:29 adgor
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.341&r2=1.341.2.1&f=u
More information about the pld-cvs-commit
mailing list