Author: qboosh Date: Sat Feb 18 23:53:04 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- sorted some configured options, removed self buildconflicts
---- Files affected:
SPECS:
qt4.spec (1.70 -> 1.71)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.70 SPECS/qt4.spec:1.71
--- SPECS/qt4.spec:1.70 Sat Feb 18 20:39:14 2006
+++ SPECS/qt4.spec Sun Feb 19 00:52:56 2006
@@ -71,6 +71,7 @@
%{?with_sqlite3:BuildRequires: sqlite3-devel}
# incompatible with bison
%{?with_cups:BuildRequires: cups-devel}
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 1:2.0.0
%{?with_pch:BuildRequires: gcc >= 5:3.4.0}
BuildRequires: libjpeg-devel
@@ -91,7 +92,6 @@
BuildRequires: xft-devel
BuildRequires: xrender-devel
BuildRequires: zlib-devel
-BuildConflicts: QtCore
Requires: OpenGL
Obsoletes: qt-extensions
Obsoletes: qt-utils
@@ -194,6 +194,7 @@
Requires: QtCore-devel = %{version}-%{release}
Requires: QtGui = %{version}-%{release}
Requires: freetype-devel >= 1:2.0.0
+Requires: fontconfig-devel
Requires: libpng-devel >= 2:1.0.8
Requires: xcursor-devel
Requires: xrender-devel
@@ -832,9 +833,9 @@
# properly optimized libs
if [ "%{_lib}" != "lib" ] ; then
- plik="mkspecs/linux-g++-64/qmake.conf"
+ cfgf="mkspecs/linux-g++-64/qmake.conf"
else
- plik="mkspecs/linux-g++/qmake.conf"
+ cfgf="mkspecs/linux-g++/qmake.conf"
fi
perl -pi -e "
@@ -843,21 +844,21 @@
s|QMAKE_LINK.*=.*g\+\+|QMAKE_LINK = %{__cxx}|;
s|QMAKE_LINK_SHLIB.*=.*g\+\+|QMAKE_LINK_SHLIB = %{__cxx}|;
s|QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT\t\t= %{_includedir}/qt4|;
- " $plik
+ " $cfgf
-cat $plik \
+cat $cfgf \
|grep -v QMAKE_CFLAGS_RELEASE \
|grep -v QMAKE_CXXFLAGS_RELEASE \
|grep -v QMAKE_CFLAGS_DEBUG \
|grep -v QMAKE_CXXFLAGS_DEBUG \
- > $plik.1
+ > $cfgf.1
-mv $plik.1 $plik
-echo >> $plik
-echo -e "QMAKE_CFLAGS_RELEASE\t= %{rpmcflags}" >> $plik
-echo -e "QMAKE_CXXFLAGS_RELEASE\t= %{rpmcxxflags}" >> $plik
-echo -e "QMAKE_CFLAGS_DEBUG\t= %{debugcflags}" >> $plik
-echo -e "QMAKE_CXXFLAGS_DEBUG\t= %{debugcflags}" >> $plik
+mv $cfgf.1 $cfgf
+echo >> $cfgf
+echo -e "QMAKE_CFLAGS_RELEASE\t= %{rpmcflags}" >> $cfgf
+echo -e "QMAKE_CXXFLAGS_RELEASE\t= %{rpmcxxflags}" >> $cfgf
+echo -e "QMAKE_CFLAGS_DEBUG\t= %{debugcflags}" >> $cfgf
+echo -e "QMAKE_CXXFLAGS_DEBUG\t= %{debugcflags}" >> $cfgf
%build
# pass OPTFLAGS to build qmake itself with optimization
@@ -898,13 +899,14 @@
%{?debug:-debug} \
%{!?debug:-release} \
-qt3support \
- -xcursor \
- -xshape \
- -xrender \
-fontconfig \
- -xkb \
+ -nis \
-sm \
- -nis"
+ -tablet \
+ -xcursor \
+ -xkb \
+ -xrender \
+ -xshape"
##################################
# STATIC MULTI-THREAD #
@@ -1389,6 +1391,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71 2006/02/18 23:52:56 qboosh
+- sorted some configured options, removed self buildconflicts
+
Revision 1.70 2006/02/18 19:39:14 qboosh
- SONAME symlinks are autogenerated
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.70&r2=1.71&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
