SPECS: qt4.spec - Release 0.3; more pkg-config files fixes
pascalek
pascalek at pld-linux.org
Tue Jul 12 22:45:59 CEST 2005
Author: pascalek Date: Tue Jul 12 20:45:59 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Release 0.3; more pkg-config files fixes
---- Files affected:
SPECS:
qt4.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.33 SPECS/qt4.spec:1.34
--- SPECS/qt4.spec:1.33 Mon Jul 11 02:19:26 2005
+++ SPECS/qt4.spec Tue Jul 12 22:45:53 2005
@@ -37,7 +37,7 @@
Name: qt4
Version: 4.0.0
#Release: 1.%{_snap}.0.1
-Release: 0.2
+Release: 0.3
License: GPL/QPL
Group: X11/Libraries
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-%{version}.tar.bz2
@@ -856,9 +856,21 @@
cd -
for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
- MODULE=`echo $f | basename $f | cut -d. -f1`
+ HAVEDEBUG=`echo $f | grep _debug | wc -l`
+ MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1`
+ MODULE2=`echo $MODULE | tr a-z A-Z | sed s:QT::`
+ DEFS="-D_REENTRANT"
+
+ if [ "$MODULE2" == "3SUPPORT" ]; then
+ DEFS="$DEFS -DQT3_SUPPORT -DQT_QT3SUPPORT_LIB"
+ else
+ DEFS="$DEFS -DQT_"$MODULE2"_LIB"
+ fi
+ [ "$HAVEDEBUG" -eq 0 ] && DEFS="$DEFS -DQT_NO_DEBUG"
+
sed -i -e s:-L`pwd`/lib::g $f
- sed -i -e s:-I\${includedir}:-I\${includedir}\ -I\${includedir}/$MODULE: $f
+ sed -i -e "s:-I\${includedir}:-I\${includedir}\ -I\${includedir}/$MODULE -I%{_datadir}/qt4/mkspec/default:" $f
+ sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
done
# Prepare some files list
@@ -1123,6 +1135,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2005/07/12 20:45:53 pascalek
+- Release 0.3; more pkg-config files fixes
+
Revision 1.33 2005/07/11 00:19:26 pascalek
- let pkg-config set includedir not only to top qt4 includedir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.33&r2=1.34&f=u
More information about the pld-cvs-commit
mailing list