[qt5-qtbase] fix/simplify qconfig.h handling

Rex Dieter rdieter at fedoraproject.org
Fri Dec 6 17:02:47 UTC 2013


commit 30c2d9f8386f4f91dd7f502a15a5ec6b3fe4b83b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 6 11:02:15 2013 -0600

    fix/simplify qconfig.h handling
    
    qt5 only has one copy of this (unlike qt4's 2)

 qt5-qtbase.spec |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index e93ee00..573c3fc 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -378,10 +378,8 @@ popd
 
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
-  mv %{buildroot}%{_qt5_headerdir}/Qt/qconfig.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-%{__isa_bits}.h
-  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-multilib.h
-  ln -sf qconfig-multilib.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h
-  ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt5_headerdir}/Qt/qconfig.h
+  mv %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-%{__isa_bits}.h
+  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h
 %endif
 
 # qtchooser conf


More information about the scm-commits mailing list