fix build error

(cherry picked from commit 50473263b6b66a820c26419150f7437b0248857c)
This commit is contained in:
chen-jan 2022-01-24 17:02:45 +08:00 committed by openeuler-sync-bot
parent c0c8f46ba9
commit 929a90439e

View File

@ -1,6 +1,6 @@
Name: qt-mobility Name: qt-mobility
Version: 1.2.2 Version: 1.2.2
Release: 4 Release: 5
Summary: Framwork of qt mobility Summary: Framwork of qt mobility
License: LGPLv2 with exceptions License: LGPLv2 with exceptions
URL: https://code.qt.io/cgit/qt-mobility/qt-mobility.git URL: https://code.qt.io/cgit/qt-mobility/qt-mobility.git
@ -14,7 +14,7 @@ Patch5: qt-mobility-opensource-src-1.2.0-translationsdir.patch
Patch6: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch Patch6: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
Patch7: qt-mobility-libnm.patch Patch7: qt-mobility-libnm.patch
BuildRequires: gcc-c++ perl proj-devel pkgconfig(xv) pkgconfig(QtGui) pkgconfig(QtOpenGL) BuildRequires: gcc-c++ perl pkgconfig(xv) pkgconfig(QtGui) pkgconfig(QtOpenGL)
BuildRequires: pkgconfig(QtDeclarative) pkgconfig(QtCore) pkgconfig(libudev) pkgconfig(libnm) BuildRequires: pkgconfig(QtDeclarative) pkgconfig(QtCore) pkgconfig(libudev) pkgconfig(libnm)
BuildRequires: pkgconfig(alsa) pkgconfig(blkid) pkgconfig(bluez) pkgconfig(libpulse) chrpath BuildRequires: pkgconfig(alsa) pkgconfig(blkid) pkgconfig(bluez) pkgconfig(libpulse) chrpath
Requires: qt4 Requires: qt4
@ -68,7 +68,6 @@ BuildArch: noarch
%prep %prep
%setup -q -n %{name}-opensource-src-%{version} %setup -q -n %{name}-opensource-src-%{version}
rm -r src/3rdparty/proj
%patch0 -p1 -b .gcc6 %patch0 -p1 -b .gcc6
%patch1 -p1 -b .pkgconfig %patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .sensors_ftbfs %patch2 -p1 -b .sensors_ftbfs
@ -96,6 +95,7 @@ make install INSTALL_ROOT=%{buildroot}
install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobility.qch install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobility.qch
mkdir -p %{buildroot}%{_qt4_docdir}/html/qtmobility mkdir -p %{buildroot}%{_qt4_docdir}/html/qtmobility
cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
mv %{buildroot}%{_qt4_translationdir} %{buildroot}%{_qt4_prefix}
%find_lang %{name} --all-name --with-qt --without-mo %find_lang %{name} --all-name --with-qt --without-mo
@ -135,6 +135,9 @@ cd -
%{_qt4_docdir}/html/qtmobility/ %{_qt4_docdir}/html/qtmobility/
%changelog %changelog
* Mon Jan 24 2022 chenchen <chen_aka_jan@163.com> - 1.2.2-5
- remove proj for fix build error
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 1.2.2-4 * Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 1.2.2-4
- update to upstream version 1.2.2-4 - update to upstream version 1.2.2-4