rpms/qt4/devel .cvsignore,1.4,1.5 qt4.spec,1.14,1.15

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec 
Log Message:
* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
- -no-reduce-exports (for now)
- -fno-strict-aliasing (fc6+)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jun 2006 15:11:02 -0000	1.4
+++ .cvsignore	20 Jul 2006 12:12:36 -0000	1.5
@@ -1,2 +1,4 @@
 clog
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4.spec	13 Jul 2006 14:24:59 -0000	1.14
+++ qt4.spec	20 Jul 2006 12:12:36 -0000	1.15
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -191,6 +191,10 @@
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
+# add -fno-strict-aliasing, for now (fc6+)
+%if "%{?fedora}" > "5"
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%endif
 # use $RPM_OPT_FLAGS for our platform
 %if "%{_lib}" == "lib64"
 %define platform linux-g++-64
@@ -225,11 +229,12 @@
   -release \
   -shared \
   -cups \
-  -fontconfig \
   -no-exceptions \
-  -no-rpath \
+  -fontconfig \
   -largefile \
   -qt-gif \
+  -no-reduce-exports \
+  -no-rpath \
   -sm \
   -stl \
   -system-libmng \
@@ -458,6 +463,10 @@
 
 
 %changelog
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+- -no-reduce-exports (for now)
+- -fno-strict-aliasing (fc6+)
+
 * 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)