forked from pool/libqt5-qttools
Fix various build failures
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=13
This commit is contained in:
parent
0764d324f3
commit
94473e4977
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Require libqt5-qttools again. This is causing multiple build issues.
|
||||
- Clean the spec file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 29 10:47:17 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
@ -31,7 +31,7 @@ Release: 0
|
||||
Summary: Qt 5 QtTools Module
|
||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only
|
||||
Group: Development/Libraries/X11
|
||||
Url: https://www.qt.io
|
||||
URL: https://www.qt.io
|
||||
%define base_name libqt5
|
||||
%define real_version 5.13.0
|
||||
%define so_version 5.13.0
|
||||
@ -77,13 +77,13 @@ and several more.
|
||||
%package devel
|
||||
Summary: Development files for the Qt5 Tools library
|
||||
Group: Development/Libraries/X11
|
||||
Requires: %{name} = %{version}
|
||||
Requires: libQt5Designer5 = %{version}
|
||||
Requires: libQt5DesignerComponents5 = %{version}
|
||||
Requires: libQt5Help5 = %{version}
|
||||
Requires: libqt5-linguist-devel = %{version}
|
||||
Requires: libxslt-devel
|
||||
Requires: pkgconfig(Qt5Xml) >= %{so_version}
|
||||
Recommends: %{name} = %{version}
|
||||
Recommends: %{name}-doc = %{version}
|
||||
|
||||
%description devel
|
||||
@ -92,8 +92,8 @@ You need this package if you want to compile programs with qttools.
|
||||
%package private-headers-devel
|
||||
Summary: Non-ABI stable experimental API for the Qt5 Tools library
|
||||
Group: Development/Libraries/C and C++
|
||||
BuildArch: noarch
|
||||
Requires: %{name}-devel = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description private-headers-devel
|
||||
This package provides private headers of libqt5-qttools that are normally
|
||||
@ -112,8 +112,8 @@ Examples for the libqt5-qttools module.
|
||||
%package -n libQt5Designer5
|
||||
Summary: Qt 5 Designer Library
|
||||
Group: Development/Libraries/X11
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5Xml5
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5Xml5
|
||||
|
||||
%description -n libQt5Designer5
|
||||
The Qt 5 Designer library.
|
||||
@ -129,9 +129,9 @@ The Qt 5 Designer Components library.
|
||||
%package -n libQt5Help5
|
||||
Summary: Qt 5 Help Library
|
||||
Group: Development/Libraries/X11
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5Sql5
|
||||
%requires_ge libQt5Network5
|
||||
%requires_ge libQt5Network5
|
||||
%requires_ge libQt5Sql5
|
||||
%requires_ge libQt5Widgets5
|
||||
|
||||
%description -n libQt5Help5
|
||||
The Qt 5 Help library.
|
||||
@ -139,9 +139,9 @@ The Qt 5 Help library.
|
||||
%package -n libqt5-linguist
|
||||
Summary: Qt 5 Linguist Tools
|
||||
Group: Development/Libraries/X11
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5Xml5
|
||||
%requires_ge libQt5PrintSupport5
|
||||
%requires_ge libQt5PrintSupport5
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQt5Xml5
|
||||
|
||||
%description -n libqt5-linguist
|
||||
The Qt 5 Linguist Tools.
|
||||
@ -187,19 +187,12 @@ Obsoletes: libqt5-qtbase-doc < %{version}
|
||||
Qt 5 tool used by Qt Developers to generate documentation for software projects.
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%post -n libQt5Designer5 -p /sbin/ldconfig
|
||||
|
||||
%post -n libQt5DesignerComponents5 -p /sbin/ldconfig
|
||||
|
||||
%post -n libQt5Help5 -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%postun -n libQt5Designer5 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libQt5DesignerComponents5 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libQt5Help5 -p /sbin/ldconfig
|
||||
|
||||
%build
|
||||
@ -213,11 +206,11 @@ mkdir .git
|
||||
|
||||
%install
|
||||
%qmake5_install
|
||||
find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec sed -i -e "s, -L%{buildroot}/?\S+,,g" -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} +
|
||||
%fdupes -s %{buildroot}/%{_libqt5_includedir}
|
||||
find %{buildroot}%{_libdir} -type f -name '*pc' -print -exec sed -i -e "s, -L%{buildroot}/?\S+,,g" -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} +
|
||||
%fdupes -s %{buildroot}%{_libqt5_includedir}
|
||||
|
||||
# kill .la files
|
||||
find %{buildroot}/%{_libdir} -type f -name '*.la' -print -delete
|
||||
find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
|
||||
|
||||
# Link all the binaries with -qt5 suffix to %%{_bindir}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
|
Loading…
Reference in New Issue
Block a user