rpms/qt4/FC-4 .cvsignore,1.4,1.5 qt4.spec,1.10,1.11
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jul 20 14:19:31 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2418
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 (fc5+)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 23 Jun 2006 18:36:33 -0000 1.4
+++ .cvsignore 20 Jul 2006 14:19:31 -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/FC-4/qt4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4.spec 5 Jul 2006 11:38:56 -0000 1.10
+++ qt4.spec 20 Jul 2006 14:19:31 -0000 1.11
@@ -5,7 +5,7 @@
Summary: Qt toolkit
Name: qt4
Version: 4.1.4
-Release: 5%{?dist}
+Release: 7%{?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
@@ -185,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
+%if "%{?fedora}" > "4"
+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
@@ -219,11 +229,12 @@
-release \
-shared \
-cups \
- -fontconfig \
-no-exceptions \
- -no-rpath \
+ -fontconfig \
-largefile \
-qt-gif \
+ -no-reduce-exports \
+ -no-rpath \
-sm \
-stl \
-system-libmng \
@@ -237,6 +248,7 @@
-xrandr \
-xrender \
-xkb \
+ %{?nas} %{!?nas:-no-nas-sound} \
%{?mysql} %{?mysql_include} %{?mysql_ldflags} \
%{?psql} \
%{?odbc} \
@@ -451,6 +463,14 @@
%changelog
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+- -no-reduce-exports (for now)
+- -fno-strict-aliasing (fc5+)
+
+* 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
More information about the fedora-extras-commits
mailing list