- -assistant subpkg (#660287)
- -config drop Obsoletes: qt-x11 (avoid/workaround #674326) - -config unconditionally drop NoDisplay (since we're dropping the Obsoletes too) - -designer-plugin-phonon subpkg (#672088)
This commit is contained in:
parent
4d01685929
commit
8858367e16
76
qt.spec
76
qt.spec
@ -18,7 +18,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.7.1
|
Version: 4.7.1
|
||||||
Release: 14%{?dist}
|
Release: 15%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
@ -251,12 +251,23 @@ Provides: %{name}-backend-gst = %{phonon_version}-%{phonon_release}
|
|||||||
%description -n phonon-backend-gstreamer
|
%description -n phonon-backend-gstreamer
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
|
%package assistant
|
||||||
|
Summary: Documentation browser for Qt 4
|
||||||
|
Group: Documentation
|
||||||
|
%if 0%{?sqlite:1}
|
||||||
|
Requires: %{name}-sqlite%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
Provides: qt4-assistant = %{version}-%{release}
|
||||||
|
Requires: %{name}-x11%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description assistant
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
%package config
|
%package config
|
||||||
Summary: Graphical configuration tool for programs using Qt 4
|
Summary: Graphical configuration tool for programs using Qt 4
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
# -config introduced in 4.7.1-10 , for upgrade path
|
# -config introduced in 4.7.1-10 , for upgrade path
|
||||||
# seems to tickle a pk bug, https://bugzilla.redhat.com/674326
|
# seems to tickle a pk bug, https://bugzilla.redhat.com/674326
|
||||||
Obsoletes: %{name}-x11 < 1:4.7.1-10
|
#Obsoletes: %{name}-x11 < 1:4.7.1-10
|
||||||
Obsoletes: qt4-config < 4.5.0
|
Obsoletes: qt4-config < 4.5.0
|
||||||
Provides: qt4-config = %{version}-%{release}
|
Provides: qt4-config = %{version}-%{release}
|
||||||
Requires: %{name}-x11%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name}-x11%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
@ -271,6 +282,13 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|||||||
%description demos
|
%description demos
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
|
%package designer-plugin-phonon
|
||||||
|
Summary: Qt Designer plugin for phonon
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
Requires: %{name}-x11%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description designer-plugin-phonon
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
%define docs 1
|
%define docs 1
|
||||||
%package doc
|
%package doc
|
||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
@ -290,6 +308,7 @@ Qt Assistant
|
|||||||
Summary: Development files for the Qt toolkit
|
Summary: Development files for the Qt toolkit
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
Requires: %{name}-designer-plugin-phonon%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: %{name}-x11%{?_isa}
|
Requires: %{name}-x11%{?_isa}
|
||||||
Requires: %{x_deps}
|
Requires: %{x_deps}
|
||||||
Requires: libpng-devel
|
Requires: libpng-devel
|
||||||
@ -433,11 +452,6 @@ Provides: phonon = %{phonon_version}-%{phonon_release}
|
|||||||
Provides: phonon%{?_isa} = %{phonon_version}-%{phonon_release}
|
Provides: phonon%{?_isa} = %{phonon_version}-%{phonon_release}
|
||||||
Provides: qt4-phonon = %{version}-%{release}
|
Provides: qt4-phonon = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?sqlite:1}
|
|
||||||
Requires: %{name}-sqlite%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|
||||||
%endif
|
|
||||||
Provides: qt4-assistant = %{version}-%{release}
|
|
||||||
Provides: %{name}-assistant = %{version}-%{release}
|
|
||||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Obsoletes: qt4-x11 < %{version}-%{release}
|
Obsoletes: qt4-x11 < %{version}-%{release}
|
||||||
Provides: qt4-x11 = %{version}-%{release}
|
Provides: qt4-x11 = %{version}-%{release}
|
||||||
@ -456,7 +470,8 @@ Qt libraries used for drawing widgets and OpenGL items.
|
|||||||
#patch16 -p1 -b .kde4_plugins
|
#patch16 -p1 -b .kde4_plugins
|
||||||
%patch19 -p1 -b .phonon_servicesfile
|
%patch19 -p1 -b .phonon_servicesfile
|
||||||
%patch23 -p1 -b .glib_eventloop_nullcheck
|
%patch23 -p1 -b .glib_eventloop_nullcheck
|
||||||
%patch24 -p1 -b .webkit
|
## make -assistant subpkg instead (#660287#9)
|
||||||
|
#patch24 -p1 -b .webkit
|
||||||
## TODO: still worth carrying? if so, upstream it.
|
## TODO: still worth carrying? if so, upstream it.
|
||||||
%patch53 -p1 -b .qatomic-inline-asm
|
%patch53 -p1 -b .qatomic-inline-asm
|
||||||
## TODO: upstream me
|
## TODO: upstream me
|
||||||
@ -619,14 +634,6 @@ desktop-file-install \
|
|||||||
--vendor="qt4" \
|
--vendor="qt4" \
|
||||||
%{?docs:%{SOURCE20}} %{SOURCE21} %{SOURCE22} %{?demos:%{SOURCE23}} %{SOURCE24}
|
%{?docs:%{SOURCE20}} %{SOURCE21} %{SOURCE22} %{?demos:%{SOURCE23}} %{SOURCE24}
|
||||||
|
|
||||||
%if 0%{?fedora} > 14
|
|
||||||
desktop-file-install \
|
|
||||||
--dir=%{buildroot}%{_datadir}/applications \
|
|
||||||
--vendor="qt4" \
|
|
||||||
--remove-key=NoDisplay \
|
|
||||||
%{buildroot}%{_datadir}/applications/*qtconfig.desktop
|
|
||||||
%endif
|
|
||||||
|
|
||||||
## pkg-config
|
## pkg-config
|
||||||
# strip extraneous dirs/libraries
|
# strip extraneous dirs/libraries
|
||||||
# safe ones
|
# safe ones
|
||||||
@ -842,6 +849,18 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post assistant
|
||||||
|
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||||
|
|
||||||
|
%posttrans assistant
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
|
||||||
|
|
||||||
|
%postun assistant
|
||||||
|
if [ $1 -eq 0 ] ; then
|
||||||
|
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
|
||||||
|
fi
|
||||||
|
|
||||||
%post devel
|
%post devel
|
||||||
touch --no-create %{_datadir}/icons/hicolor ||:
|
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||||
|
|
||||||
@ -941,6 +960,15 @@ fi
|
|||||||
%dir %{_qt4_plugindir}/sqldrivers/
|
%dir %{_qt4_plugindir}/sqldrivers/
|
||||||
%dir %{_qt4_translationdir}/
|
%dir %{_qt4_translationdir}/
|
||||||
|
|
||||||
|
%files assistant
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%if "%{_qt4_bindir}" != "%{_bindir}"
|
||||||
|
%{_bindir}/assistant*
|
||||||
|
%endif
|
||||||
|
%{_qt4_bindir}/assistant*
|
||||||
|
%{_datadir}/applications/*assistant.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/assistant*
|
||||||
|
|
||||||
%files config
|
%files config
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%if "%{_qt4_bindir}" != "%{_bindir}"
|
%if "%{_qt4_bindir}" != "%{_bindir}"
|
||||||
@ -960,6 +988,10 @@ fi
|
|||||||
%{_qt4_demosdir}/
|
%{_qt4_demosdir}/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files designer-plugin-phonon
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_qt4_plugindir}/designer/libphononwidgets.so
|
||||||
|
|
||||||
%files devel -f qt-devel.lang
|
%files devel -f qt-devel.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_qt4_bindir}/lconvert
|
%{_qt4_bindir}/lconvert
|
||||||
@ -1055,9 +1087,6 @@ fi
|
|||||||
%exclude %{_qt4_docdir}/qch/linguist.qch
|
%exclude %{_qt4_docdir}/qch/linguist.qch
|
||||||
%{_qt4_docdir}/src/
|
%{_qt4_docdir}/src/
|
||||||
#{_qt4_prefix}/doc
|
#{_qt4_prefix}/doc
|
||||||
# Qt Assistant (bin moved to -x11)
|
|
||||||
%{_datadir}/applications/*assistant.desktop
|
|
||||||
%{_datadir}/icons/hicolor/*/apps/assistant*
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -1139,6 +1168,7 @@ fi
|
|||||||
%{_qt4_plugindir}/*
|
%{_qt4_plugindir}/*
|
||||||
%exclude %{_qt4_plugindir}/crypto
|
%exclude %{_qt4_plugindir}/crypto
|
||||||
%exclude %{_qt4_plugindir}/sqldrivers
|
%exclude %{_qt4_plugindir}/sqldrivers
|
||||||
|
%exclude %{_qt4_plugindir}/designer/libphononwidgets.so
|
||||||
%if 0%{?webkit:1}
|
%if 0%{?webkit:1}
|
||||||
%exclude %{_qt4_plugindir}/designer/libqwebview.so
|
%exclude %{_qt4_plugindir}/designer/libqwebview.so
|
||||||
%endif
|
%endif
|
||||||
@ -1147,17 +1177,21 @@ fi
|
|||||||
%exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
|
%exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
|
||||||
%endif
|
%endif
|
||||||
%if "%{_qt4_bindir}" != "%{_bindir}"
|
%if "%{_qt4_bindir}" != "%{_bindir}"
|
||||||
%{_bindir}/assistant*
|
|
||||||
%{?dbus:%{_bindir}/qdbusviewer}
|
%{?dbus:%{_bindir}/qdbusviewer}
|
||||||
%{_bindir}/qmlviewer
|
%{_bindir}/qmlviewer
|
||||||
%endif
|
%endif
|
||||||
%{_qt4_bindir}/assistant*
|
|
||||||
%{?dbus:%{_qt4_bindir}/qdbusviewer}
|
%{?dbus:%{_qt4_bindir}/qdbusviewer}
|
||||||
%{_qt4_bindir}/qmlviewer
|
%{_qt4_bindir}/qmlviewer
|
||||||
%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
|
%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 09 2011 Rex Dieter <rdieter@fedoraproject.org> 1:4.7.1-15
|
||||||
|
- -assistant subpkg (#660287)
|
||||||
|
- -config drop Obsoletes: qt-x11 (avoid/workaround #674326)
|
||||||
|
- -config unconditionally drop NoDisplay (since we're dropping the Obsoletes too)
|
||||||
|
- -designer-plugin-phonon subpkg (#672088)
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.7.1-14
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.7.1-14
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
@ -7,4 +7,3 @@ Terminal=false
|
|||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Qt;Settings;
|
Categories=Qt;Settings;
|
||||||
NoDisplay=true
|
|
||||||
|
Loading…
Reference in New Issue
Block a user