rpms/qt4/FC-4 .cvsignore,1.5,1.6 qt4.spec,1.11,1.12

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16526

Modified Files:
	.cvsignore qt4.spec 
Log Message:
* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
- strip -laudio, -lglib-2.0 from .pc files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jul 2006 14:19:31 -0000	1.5
+++ .cvsignore	26 Jul 2006 03:23:28 -0000	1.6
@@ -1,4 +1,5 @@
 clog
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+qt42.spec
 


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt4.spec	20 Jul 2006 14:19:31 -0000	1.11
+++ qt4.spec	26 Jul 2006 03:23:28 -0000	1.12
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -38,7 +38,15 @@
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 # 
+%if "%{?fedora}" > "4"
+%define nas     -system-nas-sound
+%endif
+%if "%{?fedora}" == "4"
+# nas unavailable on fc4/x86_64
+%ifnarch x86_64
 %define nas     -system-nas-sound
+%endif
+%endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -272,7 +280,8 @@
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
-for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do
+for dep in -laudio -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+  -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
@@ -463,6 +472,9 @@
 
 
 %changelog
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
+- strip -laudio, -lglib-2.0 from .pc files
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
 - -no-reduce-exports (for now)
 - -fno-strict-aliasing (fc5+)