SPECS: qt4.spec - fix .pc files issue

[shadzik]

Author: shadzik                      Date: Wed May  2 16:38:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix .pc files issue

---- Files affected:
SPECS:
   qt4.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.128 SPECS/qt4.spec:1.129
--- SPECS/qt4.spec:1.128	Wed May  2 18:29:30 2007
+++ SPECS/qt4.spec	Wed May  2 18:38:36 2007
@@ -1067,10 +1067,11 @@
 
 # kill -L/inside/builddir from *.la and *.pc (bug #77152)
 %{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,prl}
-#%{__sed} -i -e '
-#	s|moc_location=.*|moc_location=%{_bindir}/qt4-moc|;
-#	s|uic_location=.*|uic_location=%{_bindir}/qt4-uic|;
-#	' $RPM_BUILD_ROOT%{_libdir}/*.pc
+%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+%{__sed} -i -e '
+	s|moc_location=.*|moc_location=%{_bindir}/qt4-moc|;
+	s|uic_location=.*|uic_location=%{_bindir}/qt4-uic|;
+	' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
 
 # install tools
 install bin/findtr	$RPM_BUILD_ROOT%{_qtdir}/bin
@@ -1147,21 +1148,21 @@
 ln -s %{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
 
 #mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
-#for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
-#	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:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
-#done
+for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
+	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:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
+done
 
 # Prepare some files list
 ifecho() {
@@ -1188,7 +1189,7 @@
 	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.so"
 	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.la"
 	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.prl"
-#	ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
+	ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
 	if [ -d "$RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE" ]; then
 		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE
 	fi
@@ -1554,6 +1555,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2007/05/02 16:38:36  shadzik
+- fix .pc files issue
+
 Revision 1.128  2007/05/02 16:29:30  shadzik
 - up to 4.3.0beta
 - raw, without patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.128&r2=1.129&f=u