[packages/qbittorrent] - fix qmake detection
baggins
baggins at pld-linux.org
Thu Jun 25 09:58:34 CEST 2015
commit 7331c99e3ebcede399e6c3a262e6416b87e6488a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jun 25 09:58:18 2015 +0200
- fix qmake detection
qbittorrent.spec | 8 +++++---
qmake.patch | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index eaa3593..fd40adf 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -14,7 +14,7 @@ Group: X11/Applications
Source0: http://downloads.sourceforge.net/qbittorrent/%{name}-%{version}.tar.gz
# Source0-md5: e058c999877317da3cc30d86782b0f54
Patch0: lang-hu-2.3.0.patch
-Patch1: boost-moc.patch
+Patch1: qmake.patch
URL: http://qbittorrent.sourceforge.net/
BuildRequires: GeoIP-devel
BuildRequires: QtCore-devel >= %{qtver}
@@ -56,10 +56,12 @@ qTorrent - graficzny klient torrenta oparty na Qt4.
%endif
%build
-# NOTE: not autoconf based configure
-./configure \
+%{__aclocal}
+%{__autoconf}
+%configure \
--verbose \
--prefix=%{_prefix} \
+ --with-boost-libdir=%{_libdir} \
%{?with_qsa:--with-qtsingleapplication=system}
%{__make} \
diff --git a/qmake.patch b/qmake.patch
new file mode 100644
index 0000000..f1b7f1e
--- /dev/null
+++ b/qmake.patch
@@ -0,0 +1,17 @@
+--- qbittorrent-3.2.0/m4/qbittorrent.m4~ 2015-05-10 03:31:33.000000000 +0200
++++ qbittorrent-3.2.0/m4/qbittorrent.m4 2015-06-25 09:55:58.292190284 +0200
+@@ -12,10 +12,10 @@
+ [QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
+ ])
+
+-AC_CHECK_FILE([$QT_QMAKE/qmake],
+- [QT_QMAKE="$QT_QMAKE/qmake"],
+- [AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
+- [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
++AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
++ [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
++ [AC_CHECK_FILE([$QT_QMAKE/qmake],
++ [QT_QMAKE="$QT_QMAKE/qmake"],
+ [QT_QMAKE=""])
+ ])
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qbittorrent.git/commitdiff/7331c99e3ebcede399e6c3a262e6416b87e6488a
More information about the pld-cvs-commit
mailing list