rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

use %make_build, %ldconfig

Browse Source 
drop %_licensedir hack
This commit is contained in:
Rex Dieter 2018-02-16 14:44:36 -06:00
parent aca5082db0
commit 6468f9c079
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt5-qtbase.spec
View File

@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.10.1 Version: 5.10.1
Release: 3%{?dist} Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -497,7 +497,7 @@ make %{?_smp_mflags} -C qmake \
QMAKE_STRIP= QMAKE_STRIP=
%endif %endif
make %{?_smp_mflags} %make_build
%install %install
@ -639,7 +639,7 @@ fi
%endif %endif
%post %post
/sbin/ldconfig %{?ldconfig}
%if 0%{?qtchooser} %if 0%{?qtchooser}
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_sysconfdir}/xdg/qtchooser/5.conf \ --install %{_sysconfdir}/xdg/qtchooser/5.conf \
@ -655,7 +655,7 @@ fi
%endif %endif
%postun %postun
/sbin/ldconfig %{?ldconfig}
%if 0%{?qtchooser} %if 0%{?qtchooser}
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
@ -669,7 +669,6 @@ fi
%endif %endif
%files %files
%{!?_licensedir:%global license %%doc}
%license LICENSE.LGPL* LGPL_EXCEPTION.txt LICENSE.FDL %license LICENSE.LGPL* LGPL_EXCEPTION.txt LICENSE.FDL
%if 0%{?qtchooser} %if 0%{?qtchooser}
%dir %{_sysconfdir}/xdg/qtchooser %dir %{_sysconfdir}/xdg/qtchooser
@ -990,6 +989,10 @@ fi
%changelog %changelog
* Fri Feb 16 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-4
- use %%make_build, %%ldconfig
- drop %%_licensedir hack
* Thu Feb 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3 * Thu Feb 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3
- qt5-qtbase: RPM build flags only partially injected (#1543888) - qt5-qtbase: RPM build flags only partially injected (#1543888)