From 929a90439ed3085dab685f63d071c23c5a647911 Mon Sep 17 00:00:00 2001 From: chen-jan Date: Mon, 24 Jan 2022 17:02:45 +0800 Subject: [PATCH] fix build error (cherry picked from commit 50473263b6b66a820c26419150f7437b0248857c) --- qt-mobility.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qt-mobility.spec b/qt-mobility.spec index c67645d..c7ed7ed 100644 --- a/qt-mobility.spec +++ b/qt-mobility.spec @@ -1,6 +1,6 @@ Name: qt-mobility Version: 1.2.2 -Release: 4 +Release: 5 Summary: Framwork of qt mobility License: LGPLv2 with exceptions 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 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(alsa) pkgconfig(blkid) pkgconfig(bluez) pkgconfig(libpulse) chrpath Requires: qt4 @@ -68,7 +68,6 @@ BuildArch: noarch %prep %setup -q -n %{name}-opensource-src-%{version} -rm -r src/3rdparty/proj %patch0 -p1 -b .gcc6 %patch1 -p1 -b .pkgconfig %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 mkdir -p %{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 @@ -135,6 +135,9 @@ cd - %{_qt4_docdir}/html/qtmobility/ %changelog +* Mon Jan 24 2022 chenchen - 1.2.2-5 +- remove proj for fix build error + * Wed Oct 13 2021 peijiankang - 1.2.2-4 - update to upstream version 1.2.2-4