[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/qt4/devel .cvsignore, 1.16, 1.17 qt4.spec, 1.44, 1.45 sources, 1.12, 1.13 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2, NONE qt-x11-opensource-src-4.2.3-qt#153635.patch, 1.1, NONE utf8-bug-qt4-2.diff, 1.1, NONE



Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Removed Files:
	0154-qdbuscpp2xml-moc_path.diff 
	qt-x11-opensource-src-4.1.2-assistant4.patch 
	qt-x11-opensource-src-4.2.3-qt#153635.patch 
	utf8-bug-qt4-2.diff 
Log Message:
* Fri May 04 2007 Kevin Kofler <Kevin tigcc ticalc org> 4.3.0-0.4.rc1
- update to 4.3.0 RC1
- drop LD_RUN_PATH hack

* Fri May 04 2007 Kevin Kofler <Kevin tigcc ticalc org> 4.3.0-0.3.snapshot20070423
- update to qt-4.3.0-snapshot-20070423
- build with SSL support (BR openssl-devel)
- drop upstreamed mysql_config.patch

* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-0.2.beta
- qt-4.3.0beta
- -system-libtiff, BR: libtiff-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	25 Apr 2007 15:14:19 -0000	1.16
+++ .cvsignore	18 May 2007 19:29:17 -0000	1.17
@@ -1,2 +1,3 @@
 clog
 qt-x11-opensource-src-4.2.3.tar.gz
+qt-x11-opensource-src-4.3.0rc1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qt4.spec	3 May 2007 14:11:10 -0000	1.44
+++ qt4.spec	18 May 2007 19:29:17 -0000	1.45
@@ -2,26 +2,24 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
-#define beta rc1
+%define beta rc1
 #define preview -preview
-#define rel %{beta}
 
-#define snap 20060927
-#define beta snapshot-%{snap}
-#define rel  %{snap}
+#define snap 20070423
+#define beta snapshot%{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.3
-Release: 8%{?dist}
+Version: 4.3.0
+Release: 0.4.%{beta}%{?dist}
 
 License: GPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
 %if "%{?snap:1}" == "1"
-Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}-%{snap}.tar.bz2
 %else
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta}.tar.gz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,16 +30,10 @@
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
-Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
+Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# CVE-2007-0242
-Patch3: utf8-bug-qt4-2.diff
 ## qt-copy patches
-Patch0154: 0154-qdbuscpp2xml-moc_path.diff
-## upstream patches
-#  http://www.trolltech.com/developer/task-tracker/?method=entry&id=153635
-Patch153635: qt-x11-opensource-src-4.2.3-qt#153635.patch
 
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
@@ -98,10 +90,12 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
 BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
 BuildRequires: libungif-devel
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
+BuildRequires: openssl-devel
 
 ## In theory, should be as simple as:
 #define x_deps libGL-devel libGLU-devel
@@ -110,7 +104,7 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -129,7 +123,7 @@
 %endif
 
 %if "%{?sqlite:1}" != "-no-sql-sqlite"
-%if 0%{?fedora} > 2 
+%if 0%{?fedora} > 2
 %define _system_sqlite -system-sqlite
 BuildRequires: sqlite-devel
 %endif
@@ -137,6 +131,8 @@
 
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
+## libQtScript Obsoletes libqsa ?
+# Obsoletes: qt4-qsa 
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -168,9 +164,6 @@
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
-# For docs -> doc rename, temporary, since it was a short-lived subpkg
-#Obsoletes: %{name}-docs < %{version}-%{release}
-#Provides:  %{name}-docs = %{version}-%{release}
 %description doc
 %{summary}.  Includes:
 Qt Assistant, Qt Demo
@@ -220,14 +213,15 @@
 
 
 %prep
+%if "%{?snap:1}" == "1"
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap}
+%else
 %setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
+%endif
 
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
-%patch3 -p0 -b .utf8-bug
-%patch0154 -p0 -b .qt-copy#0154
-%patch153635 -p1 -b .qt#153635
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -267,11 +261,6 @@
 
 %build
 
-# There's a bug in the qdbus build somewhere, but we'll hack around it here for now -- Rex
-%if "%{?qdbus}" == "-qdbus"
-LD_RUN_PATH=$(pwd)/lib;export LD_RUN_PATH
-%endif
-
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
   -prefix %{qt4_prefix} \
@@ -298,6 +287,7 @@
   -system-libmng \
   -system-libpng \
   -system-libjpeg \
+  -system-libtiff \
   -system-zlib \
   -tablet \
   -xcursor \
@@ -308,6 +298,7 @@
   -xrender \
   -xkb \
   -glib \
+  -openssl \
   %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
   %{?mysql} \
@@ -336,21 +327,18 @@
 for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
 done
 # riskier
 for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc 
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
 done
 # nuke dandling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt4_libdir}/*.prl
 
-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mv %{buildroot}%{qt4_libdir}/*.pc %{buildroot}%{_libdir}/pkgconfig/
-
 # -doc make symbolic link to qt4_docdir
 rm -rf %{buildroot}%{qtdir}/doc
 ln -s  ../../share/doc/qt %{buildroot}%{qtdir}/doc
@@ -452,6 +440,7 @@
 %{qt4_libdir}/libQtDBus.so.*
 %endif
 %{qt4_libdir}/libQtNetwork.so.*
+%{qt4_libdir}/libQtScript.so.*
 %{qt4_libdir}/libQtSql.so.*
 %{qt4_libdir}/libQtTest.so.*
 %{qt4_libdir}/libQtXml.so.*
@@ -564,6 +553,19 @@
 
 
 %changelog
+* Fri May 04 2007 Kevin Kofler <Kevin tigcc ticalc org> 4.3.0-0.4.rc1
+- update to 4.3.0 RC1
+- drop LD_RUN_PATH hack
+
+* Fri May 04 2007 Kevin Kofler <Kevin tigcc ticalc org> 4.3.0-0.3.snapshot20070423
+- update to qt-4.3.0-snapshot-20070423
+- build with SSL support (BR openssl-devel)
+- drop upstreamed mysql_config.patch
+
+* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-0.2.beta
+- qt-4.3.0beta
+- -system-libtiff, BR: libtiff-devel
+
 * Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
 - QFileDialog file wrapping patch (qt#153635, rh#236908)
 - License: GPL, dropping LICENSE.QPL (#237702)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Mar 2007 13:17:14 -0000	1.12
+++ sources	18 May 2007 19:29:17 -0000	1.13
@@ -1 +1 @@
-13f12bf58a32ebf15837fcd605cb3c99  qt-x11-opensource-src-4.2.3.tar.gz
+28f839b5fd3e475d995bbc0a2a8b24f1  qt-x11-opensource-src-4.3.0rc1.tar.gz


--- 0154-qdbuscpp2xml-moc_path.diff DELETED ---


--- qt-x11-opensource-src-4.1.2-assistant4.patch DELETED ---


--- qt-x11-opensource-src-4.2.3-qt#153635.patch DELETED ---


--- utf8-bug-qt4-2.diff DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]