rpms/qt4/F-8 .cvsignore, 1.25, 1.26 qt4.spec, 1.82, 1.83 sources, 1.21, 1.22
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Wed Jul 23 16:28:59 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/qt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25823/F-8
Modified Files:
.cvsignore qt4.spec sources
Log Message:
Sync from qt/devel:
* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-16
- qt-copy-patches-20080723 (kde#162793)
- omit deprecated phonon bits
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 19 Jul 2008 11:50:28 -0000 1.25
+++ .cvsignore 23 Jul 2008 16:27:52 -0000 1.26
@@ -1,4 +1,4 @@
hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
qt-x11-opensource-src-4.4.0.tar.bz2
-qt-copy-patches-20080711svn.tar.bz2
+qt-copy-patches-20080723svn.tar.bz2
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- qt4.spec 19 Jul 2008 14:39:05 -0000 1.82
+++ qt4.spec 23 Jul 2008 16:27:52 -0000 1.83
@@ -8,7 +8,7 @@
Name: qt4
%endif
Version: 4.4.0
-Release: 14%{?dist}
+Release: 16%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL
@@ -39,7 +39,7 @@
Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
## qt-copy patches
-%define qt_copy 20080711
+%define qt_copy 20080723
Source1: qt-copy-patches-svn_checkout.sh
%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
%{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -65,8 +65,6 @@
%define odbc -plugin-sql-odbc
%define psql -plugin-sql-psql
%define sqlite -plugin-sql-sqlite
-# FIXME: building -no-phonon currently busted, build fails -- Rex
-#define phonon -phonon -gstreamer
%define webkit -webkit
#define nas -system-nas-sound
@@ -111,7 +109,6 @@
BuildRequires: zlib-devel
BuildRequires: glib2-devel
BuildRequires: openssl-devel
-%{?phonon:BuildRequires: gstreamer-devel >= 0.10.12, gstreamer-plugins-base-devel}
## In theory, should be as simple as:
#define x_deps libGL-devel libGLU-devel
@@ -228,16 +225,6 @@
%description mysql
%{summary}.
-%package phonon-devel
-Summary: Phonon development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-# FIXME
-Conflicts: kdelibs4-devel < 4.1
-
-%description phonon-devel
-%{summary}.
-
%package postgresql
Summary: PostgreSQL driver for Qt's SQL classes
Group: System Environment/Libraries
@@ -288,11 +275,7 @@
%prep
-%if "%{?snap:1}" == "1"
-%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap}
-%else
%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
-%endif
%if 0%{?qt_copy:1}
test -x apply_patches && ./apply_patches
@@ -370,6 +353,7 @@
-no-rpath \
-reduce-relocations \
-no-separate-debug-info \
+ -no-phonon -no-gstreamer \
-sm \
-stl \
-system-libmng \
@@ -388,9 +372,7 @@
-glib \
-openssl-linked \
-xmlpatterns \
- %{?phonon} %{!?phonon:-no-phonon } \
%{?dbus} %{!?dbus:-no-dbus} \
- %{?phonon} %{!?phonon:-no-phonon -no-gstreamer} \
%{?webkit} %{!?webkit:-no-webkit } \
%{?nas} \
%{?mysql} \
@@ -584,7 +566,6 @@
%files
%defattr(-,root,root,-)
%doc README*
-%{!?snap:%doc OPENSOURCE-NOTICE.TXT}
%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
%doc LICENSE.GPL3
%doc LICENSE.QPL
@@ -640,7 +621,6 @@
%{_qt4_libdir}/libQtOpenGL.so.*
%{_qt4_libdir}/libQtSvg.so.*
%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
-%{?phonon:%{_qt4_libdir}/libphonon.so.*}
%{_qt4_plugindir}/*
%exclude %{_qt4_plugindir}/designer
%exclude %{_qt4_plugindir}/sqldrivers
@@ -697,8 +677,6 @@
%dir %{_qt4_headerdir}/
%endif
%{_qt4_headerdir}/*
-%{?phonon:%exclude %{_qt4_headerdir}/phonon/}
-%{?phonon:%exclude %{_qt4_headerdir}/Qt/phonon*}
%{_qt4_datadir}/mkspecs/
%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
%{_qt4_prefix}/mkspecs/
@@ -709,7 +687,6 @@
%{_qt4_libdir}/libQt*.a
%{_qt4_libdir}/libQt*.prl
%{_libdir}/pkgconfig/*.pc
-%{?phonon:%exclude %{_libdir}/pkgconfig/phonon.pc}
# Qt designer
%{_qt4_bindir}/designer*
%{_qt4_plugindir}/designer/
@@ -737,16 +714,6 @@
%endif
%{_datadir}/applications/*qtdemo*.desktop
-%if 0%{?phonon:1}
-%files phonon-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/phonon.pc
-%{_qt4_headerdir}/phonon/
-%{_qt4_headerdir}/Qt/phonon*
-%{_qt4_libdir}/libphonon.so
-%{_qt4_libdir}/libphonon.prl
-%endif
-
%if "%{?odbc}" == "-plugin-sql-odbc"
%files odbc
%defattr(-,root,root,-)
@@ -773,6 +740,13 @@
%changelog
+* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-16
+- qt-copy-patches-20080723 (kde#162793)
+- omit deprecated phonon bits
+
+* Sat Jul 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-15
+- fix/workaround spec syntax
+
* Sat Jul 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-14
- macros.qt4: fix %%_qt4_datadir, %%_qt4_translationdir
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 19 Jul 2008 11:50:28 -0000 1.21
+++ sources 23 Jul 2008 16:27:52 -0000 1.22
@@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2
-7cf6bdbd220fb8915f8d875442e29961 qt-copy-patches-20080711svn.tar.bz2
+bb7e7e6aa739c0c87e3cb3dbfe0fa814 qt-copy-patches-20080723svn.tar.bz2
More information about the fedora-extras-commits
mailing list