diff --git a/macros.qt5-srpm b/macros.qt5-srpm new file mode 100644 index 0000000..46bd712 --- /dev/null +++ b/macros.qt5-srpm @@ -0,0 +1,8 @@ + +# # the architectures theoretically supported by the version of V8 used (#1298011) +# # You may need some minor patching to build on one of the secondary +# # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations. +# # If you cannot get this package to build on your secondary architecure, please: +# # * remove your architecture from this list AND +# # * put #1298011 onto your ExcludeArch tracker. +%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el diff --git a/qt5.spec b/qt5.spec index 24ee0f3..55ecfd4 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,10 +1,14 @@ + +%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + Name: qt5 -Version: 5.7.0 -Release: 6%{?dist} +Version: 5.6.2 +Release: 1%{?dist} Summary: Qt5 meta package License: GPLv3 URL: https://getfedora.org/ Source0: macros.qt5 +Source1: macros.qt5-srpm BuildArch: noarch Requires: qt5-gstreamer Requires: qt5-qdbusviewer @@ -31,7 +35,7 @@ Requires: qt5-qtsvg Requires: qt5-qttools Requires: qt5-qtwayland Requires: qt5-qtwebchannel -Requires: qt5-qtwebengine +#Requires: qt5-qtwebengine Requires: qt5-qtwebkit Requires: qt5-qtwebsockets Requires: qt5-qtx11extras @@ -42,7 +46,6 @@ Requires: qt5-qtxmlpatterns %package devel Summary: Qt5 meta devel package -Requires: qt5-rpm-macros Requires: qt5-qttools-static Requires: qt5-qtdeclarative-static Requires: qt5-qtbase-static @@ -67,7 +70,7 @@ Requires: qt5-qtsvg-devel Requires: qt5-qttools-devel Requires: qt5-qtwayland-devel Requires: qt5-qtwebchannel-devel -Requires: qt5-qtwebengine-devel +#Requires: qt5-qtwebengine-devel Requires: qt5-qtwebkit-devel Requires: qt5-qtwebsockets-devel Requires: qt5-qtx11extras-devel @@ -85,46 +88,37 @@ Requires: cmake >= 3 %if 0%{?rhel} Requires: cmake3 %endif - - %description rpm-macros RPM macros for building KDE Frameworks 5 packages. +%package srpm-macros +Summary: RPM macros for source Qt5 packages +%description srpm-macros +%{summary}. + + %install -install -Dpm644 %{_sourcedir}/macros.qt5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 +install -Dpm644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.qt5-srpm -mkdir -p %{buildroot}%{_docdir}/qt5 -mkdir -p %{buildroot}%{_docdir}/qt5-devel -echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README -echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README +#mkdir -p %{buildroot}%{_docdir}/qt5 +#mkdir -p %{buildroot}%{_docdir}/qt5-devel +#echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README +#echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README -%files -%{_docdir}/qt5/README +#files +#{_docdir}/qt5/README -%files devel -%{_docdir}/qt5-devel/README +#files devel +#{_docdir}/qt5-devel/README + +#files rpm-macros +#{rpm_macros_dir}/macros.qt5 + +%files srpm-macros +%{rpm_macros_dir}/macros.qt5-srpm -%files rpm-macros -%{_rpmconfigdir}/macros.d/macros.qt5 %changelog -* Tue Jul 12 2016 Helio Chissini de Castro - 5.7.0-6 -- Fix macros with invalid substitutions. +* Wed Nov 16 2016 Rex Dieter - 5.6.2-1 +- first try, qt5-srpm-macros only (based on 5.7.0 branch) -* Wed Jul 06 2016 Helio Chissini de Castro - 5.7.0-5 -- Fix typo. Thanks to Diego Herrera. -- Add macro qt5_includedir as more logical than headerdir. Old one still available - -* Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-4 -- Clang is not default anymore. End of experimentation phase - -* Wed Jun 15 2016 Helio Chissini de Castro - 5.7.0-3 -- Move package to be qt5 and create meta packages -- Add new macro for qml dir - -* Mon Jun 13 2016 Helio Chissini de Castro - 5.7.0-2 -- Test repositories using clang by default - - -* Thu Jun 09 2016 Helio Chissini de Castro - 5.7.0-1 -- Decouple macros from main qtbase package