Author: glen Date: Sun Feb 19 15:45:23 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use sed for inline edits
---- Files affected:
SPECS:
qt4.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.73 SPECS/qt4.spec:1.74
--- SPECS/qt4.spec:1.73 Sun Feb 19 10:10:14 2006
+++ SPECS/qt4.spec Sun Feb 19 16:45:18 2006
@@ -3,7 +3,7 @@
# TODO:
# - QtUiTools to subpackage
# (headers in %{_includedir}/qt4/QtUiTools, but (static-only) lib is not installed)
-# - qt4-designer-libs vs QtDesigner-{devel,static} naming inconsistency
+# - qt4-designer-libs vs QtDesigner-{devel,static} naming inconsistency
# - better descriptions
# - more cleanups
# - check if translations are available
@@ -81,7 +81,6 @@
BuildRequires: libungif-devel
%{?with_mysql:BuildRequires: mysql-devel}
%{?with_nas:BuildRequires: nas-devel}
-BuildRequires: perl-base
%{?with_pgsql:BuildRequires: postgresql-backend-devel}
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 1.213
@@ -102,7 +101,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
-%define _noautostrip '.*_debug\\.so*'
+%define _noautostrip '.*_debug\\.so*'
%define specflags -fno-strict-aliasing
@@ -196,8 +195,8 @@
Group: X11/Development/Libraries
Requires: QtCore-devel = %{version}-%{release}
Requires: QtGui = %{version}-%{release}
-Requires: freetype-devel >= 1:2.0.0
Requires: fontconfig-devel
+Requires: freetype-devel >= 1:2.0.0
Requires: libpng-devel >= 2:1.0.8
Requires: xorg-lib-libSM-devel
Requires: xorg-lib-libXcursor-devel
@@ -848,19 +847,19 @@
cfgf="mkspecs/linux-g++/qmake.conf"
fi
-perl -pi -e "
+sed -i -e '
s|QMAKE_CC.*=.*gcc|QMAKE_CC = %{__cc}|;
- s|QMAKE_CXX.*=.*g\+\+|QMAKE_CXX = %{__cxx}|;
- 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|;
- " $cfgf
+ s|QMAKE_CXX.*=.*g++|QMAKE_CXX = %{__cxx}|;
+ s|QMAKE_LINK.*=.*g++|QMAKE_LINK = %{__cxx}|;
+ s|QMAKE_LINK_SHLIB.*=.*g++|QMAKE_LINK_SHLIB = %{__cxx}|;
+ s|QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = %{_includedir}/qt4|;
+ ' $cfgf
cat $cfgf \
- |grep -v QMAKE_CFLAGS_RELEASE \
- |grep -v QMAKE_CXXFLAGS_RELEASE \
- |grep -v QMAKE_CFLAGS_DEBUG \
- |grep -v QMAKE_CXXFLAGS_DEBUG \
+ | grep -v QMAKE_CFLAGS_RELEASE \
+ | grep -v QMAKE_CXXFLAGS_RELEASE \
+ | grep -v QMAKE_CFLAGS_DEBUG \
+ | grep -v QMAKE_CXXFLAGS_DEBUG \
> $cfgf.1
mv $cfgf.1 $cfgf
@@ -1401,6 +1400,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2006/02/19 15:45:18 glen
+- use sed for inline edits
+
Revision 1.73 2006/02/19 09:10:14 qboosh
- removed obsolete deps
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.73&r2=1.74&f=u