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

macros.qt5: we really only want the null-pointer-checks flag here

Browse Source 
and definitely no arch-specific ones
This commit is contained in:
Rex Dieter 2016-03-19 08:09:29 -05:00
parent 0947855825
commit 679d20fecf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qt5-qtbase.spec
View File

@ -56,7 +56,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.6.0 Version: 5.6.0
Release: 5%{?prerelease:.%{prerelease}}%{?dist} Release: 6%{?prerelease:.%{prerelease}}%{?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
@ -548,7 +548,7 @@ sed -i \
-e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \ -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \
-e "s|@@QT5_CXXFLAGS@@|%{?qt5_null_flag}|g" \ -e "s|@@QT5_CXXFLAGS@@|%{?qt5_null_flag}|g" \
-e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \ -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
-e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_arm_flag} %{?qt5_deprecated_flag}|g" \ -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags}|g" \
%{buildroot}%{rpm_macros_dir}/macros.qt5 %{buildroot}%{rpm_macros_dir}/macros.qt5
# create/own dirs # create/own dirs
@ -957,6 +957,10 @@ fi
%changelog %changelog
* Sat Mar 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-6
- macros.qt5: we really only want the null-pointer-checks flag here
and definitely no arch-specific ones
* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-5 * Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-5
- macros.qt5: cleanup, %%_qt5_cflags, %%_qt5_cxxflags (for f24+) - macros.qt5: cleanup, %%_qt5_cflags, %%_qt5_cxxflags (for f24+)