BR: gcc-c++, use %license, .spec cosmetics

This commit is contained in:
Rex Dieter 2018-02-20 16:02:13 -06:00
parent ccfeb6a608
commit de7f39d5ed
1 changed files with 7 additions and 18 deletions

25
qt.spec
View File

@ -40,7 +40,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.7 Version: 4.8.7
Release: 36%{?dist} Release: 37%{?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
@ -274,6 +274,7 @@ Source1: macros.qt4
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libmng-devel BuildRequires: libmng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
@ -1077,8 +1078,8 @@ fi
%endif %endif
%files -f qt.lang %files -f qt.lang
%defattr(-,root,root,-) %doc README
%doc README LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt %license LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt
%if 0%{?qtchooser} %if 0%{?qtchooser}
%dir %{_sysconfdir}/xdg/qtchooser %dir %{_sysconfdir}/xdg/qtchooser
# not editable config files, so not using %%config here # not editable config files, so not using %%config here
@ -1149,7 +1150,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi fi
%files assistant %files assistant
%defattr(-,root,root,-)
%if "%{_qt4_bindir}" != "%{_bindir}" %if "%{_qt4_bindir}" != "%{_bindir}"
%{_bindir}/assistant* %{_bindir}/assistant*
%endif %endif
@ -1158,7 +1158,6 @@ fi
%{_datadir}/icons/hicolor/*/apps/assistant* %{_datadir}/icons/hicolor/*/apps/assistant*
%files config %files config
%defattr(-,root,root,-)
%if "%{_qt4_bindir}" != "%{_bindir}" %if "%{_qt4_bindir}" != "%{_bindir}"
%{_bindir}/qt*config* %{_bindir}/qt*config*
%endif %endif
@ -1167,7 +1166,6 @@ fi
%if 0%{?demos} %if 0%{?demos}
%files demos %files demos
%defattr(-,root,root,-)
%{_qt4_bindir}/qt*demo* %{_qt4_bindir}/qt*demo*
%if "%{_qt4_bindir}" != "%{_bindir}" %if "%{_qt4_bindir}" != "%{_bindir}"
%{_bindir}/qt*demo* %{_bindir}/qt*demo*
@ -1178,7 +1176,6 @@ fi
%if "%{?webkit}" == "-webkit" %if "%{?webkit}" == "-webkit"
%files designer-plugin-webkit %files designer-plugin-webkit
%defattr(-,root,root,-)
%{_qt4_plugindir}/designer/libqwebview.so %{_qt4_plugindir}/designer/libqwebview.so
%endif %endif
@ -1197,7 +1194,6 @@ update-desktop-database -q &> /dev/null ||:
fi fi
%files devel -f qt-devel.lang %files devel -f qt-devel.lang
%defattr(-,root,root,-)
%{rpm_macros_dir}/macros.qt4 %{rpm_macros_dir}/macros.qt4
%{_qt4_bindir}/lconvert %{_qt4_bindir}/lconvert
%{_qt4_bindir}/lrelease* %{_qt4_bindir}/lrelease*
@ -1278,7 +1274,6 @@ fi
%exclude %{_qt4_headerdir}/*/private/ %exclude %{_qt4_headerdir}/*/private/
%files devel-private %files devel-private
%defattr(-,root,root,-)
%{_qt4_headerdir}/QtCore/private/ %{_qt4_headerdir}/QtCore/private/
%{_qt4_headerdir}/QtDeclarative/private/ %{_qt4_headerdir}/QtDeclarative/private/
%{_qt4_headerdir}/QtGui/private/ %{_qt4_headerdir}/QtGui/private/
@ -1291,7 +1286,6 @@ fi
%if 0%{?docs} %if 0%{?docs}
%files doc %files doc
%defattr(-,root,root,-)
%{_qt4_docdir}/html/* %{_qt4_docdir}/html/*
%{_qt4_docdir}/qch/*.qch %{_qt4_docdir}/qch/*.qch
%exclude %{_qt4_docdir}/qch/designer.qch %exclude %{_qt4_docdir}/qch/designer.qch
@ -1302,44 +1296,37 @@ fi
%if 0%{?examples} %if 0%{?examples}
%files examples %files examples
%defattr(-,root,root,-)
%{_qt4_examplesdir}/ %{_qt4_examplesdir}/
%endif %endif
%if 0%{?qvfb} %if 0%{?qvfb}
%files qvfb -f qvfb.lang %files qvfb -f qvfb.lang
%defattr(-,root,root,-)
%{_bindir}/qvfb %{_bindir}/qvfb
%{_qt4_bindir}/qvfb %{_qt4_bindir}/qvfb
%endif %endif
%if "%{?ibase}" == "-plugin-sql-ibase" %if "%{?ibase}" == "-plugin-sql-ibase"
%files ibase %files ibase
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqlibase* %{_qt4_plugindir}/sqldrivers/libqsqlibase*
%endif %endif
%if "%{?mysql}" == "-plugin-sql-mysql" %if "%{?mysql}" == "-plugin-sql-mysql"
%files mysql %files mysql
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqlmysql* %{_qt4_plugindir}/sqldrivers/libqsqlmysql*
%endif %endif
%if "%{?odbc}" == "-plugin-sql-odbc" %if "%{?odbc}" == "-plugin-sql-odbc"
%files odbc %files odbc
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqlodbc* %{_qt4_plugindir}/sqldrivers/libqsqlodbc*
%endif %endif
%if "%{?psql}" == "-plugin-sql-psql" %if "%{?psql}" == "-plugin-sql-psql"
%files postgresql %files postgresql
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqlpsql* %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
%endif %endif
%if "%{?tds}" == "-plugin-sql-tds" %if "%{?tds}" == "-plugin-sql-tds"
%files tds %files tds
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqltds* %{_qt4_plugindir}/sqldrivers/libqsqltds*
%endif %endif
@ -1358,7 +1345,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi fi
%files x11 -f qt-x11.lang %files x11 -f qt-x11.lang
%defattr(-,root,root,-)
%dir %{_qt4_importdir}/ %dir %{_qt4_importdir}/
%{_qt4_importdir}/Qt/ %{_qt4_importdir}/Qt/
%{_qt4_libdir}/libQt3Support.so.4* %{_qt4_libdir}/libQt3Support.so.4*
@ -1404,6 +1390,9 @@ fi
%changelog %changelog
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-37
- BR: gcc-c++, use %%license, .spec cosmetics
* Thu Feb 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-36 * Thu Feb 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-36
- qt: Fedora build flags only partially applied (#1543887) - qt: Fedora build flags only partially applied (#1543887)