rpms/qt4/F-8 qt4.spec,1.81,1.82

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Jul 19 14:40:09 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/qt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32361/F-8

Modified Files:
	qt4.spec 
Log Message:
Sync again from qt/devel.


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- qt4.spec	19 Jul 2008 13:48:48 -0000	1.81
+++ qt4.spec	19 Jul 2008 14:39:05 -0000	1.82
@@ -69,8 +69,8 @@
 #define phonon -phonon -gstreamer
 %define webkit -webkit
 
-# undefine to disable these
 #define nas -system-nas-sound
+%define nas -no-nas-sound
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 # link dbus
 %define dbus -dbus-linked
@@ -122,7 +122,7 @@
 %endif
 BuildRequires: %{x_deps}
 
-%if "%{?nas}" == "-system-nas-sound"
+%if "%{?nas}" != "-no-nas-sound"
 BuildRequires: nas-devel
 %endif
 
@@ -392,7 +392,7 @@
   %{?dbus} %{!?dbus:-no-dbus} \
   %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \
   %{?webkit} %{!?webkit:-no-webkit } \
-  %{?nas} %{!?nas:-no-nas-sound} \
+  %{?nas} \
   %{?mysql} \
   %{?psql} \
   %{?odbc} \




More information about the fedora-extras-commits mailing list