rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Header file name mismatch in qt-devel i686 (#808087)

Browse Source
This commit is contained in:
Rex Dieter 2012-03-29 11:07:37 -05:00
parent 81f4e80bb5
commit 6e276638e1
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qconfig-multilib.h
View File

@ -4,24 +4,17 @@
* *
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
#if defined(__x86_64__) #ifndef QCONFIG_MULTILIB_H
# include <QtCore/qconfig-x86_64.h> #define QCONFIG_MULTILIB_H
#elif defined(__i386__) #include <bits/wordsize.h>
# include <QtCore/qconfig-i386.h>
#elif defined(__powerpc64__) #if __WORDSIZE == 32
# include <QtCore/qconfig-ppc64.h> #include "QtCore/qconfig-32.h"
#elif defined(__powerpc__) #elif __WORDSIZE == 64
# include <QtCore/qconfig-ppc.h> #include "QtCore/qconfig-64.h"
#elif defined(__s390x__)
# include <QtCore/qconfig-s390x.h>
#elif defined(__s390__)
# include <QtCore/qconfig-s390.h>
#elif defined(__sparc__) && defined (__arch64__)
# include <QtCore/qconfig-sparc64.h>
#elif defined(__sparc__)
# include <QtCore/qconfig-sparc.h>
#else #else
/* Should never reach this point, if so see bugzilla.redhat.com/223663 */ #error "unexpected value for __WORDSIZE macro"
#error "This qt4-devel package does not work your architecture?" #endif
#endif #endif

9
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.1 Version: 4.8.1
Release: 2%{?dist} Release: 3%{?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
@ -650,7 +650,7 @@ popd
%ifarch %{multilib_archs} %ifarch %{multilib_archs}
# multilib: qconfig.h # multilib: qconfig.h
mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{__isa_bits}.h
install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
@ -658,7 +658,7 @@ popd
%if "%{_qt4_libdir}" != "%{_libdir}" %if "%{_qt4_libdir}" != "%{_libdir}"
mkdir -p %{buildroot}/etc/ld.so.conf.d mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{__isa_bits}.conf
%endif %endif
# Trolltech.conf # Trolltech.conf
@ -1060,6 +1060,9 @@ fi
%changelog %changelog
* Thu Mar 29 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-3
- Header file name mismatch in qt-devel i686 (#808087)
* Thu Mar 29 2012 Than Ngo <than@redhat.com> - 4.8.1-2 * Thu Mar 29 2012 Than Ngo <than@redhat.com> - 4.8.1-2
- add correct flags - add correct flags