rpms/qt4/devel qt4.spec,1.13,1.14

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25630

Modified Files:
	qt4.spec 
Log Message:
* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
- make buildable on legacy releases
- -system-nas-sound (bug #197937) 



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4.spec	5 Jul 2006 11:37:58 -0000	1.13
+++ qt4.spec	13 Jul 2006 14:24:59 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -37,6 +37,8 @@
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
+# 
+%define nas     -system-nas-sound
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -73,6 +75,10 @@
 %endif
 BuildRequires: %{x_deps}
 
+%if "%{?nas}" == "-system-nas-sound"
+BuildRequires: nas-devel
+%endif
+
 %if "%{?mysql}" != "-no-sql-mysql"
 # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet.  -- Rex
 BuildRequires: mysql-devel >= 4.0
@@ -237,6 +243,7 @@
   -xrandr \
   -xrender \
   -xkb \
+  %{?nas} %{!?nas:-no-nas-sound} \
   %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
   %{?psql}   \
   %{?odbc}   \
@@ -451,6 +458,10 @@
 
 
 %changelog
+* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
+- make buildable on legacy releases
+- -system-nas-sound (bug #197937) 
+
 * Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
 - make FHS-friendly (bug #196901)
 - cleanup %%_bindir symlinks, (consistently) use qt4 postfix