- up to 3.2.0

diff --git a/boost-moc.patch b/boost-moc.patch
index 88d0ec4759750c890a1f7d7aa86d1fca3b585df6..aa7f442b98759a40972d28679098251c1463c0ff 100644 (file)
--- a/boost-moc.patch
+++ b/boost-moc.patch
@@ -1,5 +1,5 @@
---- qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h.orig      2015-02-19 22:16:34.767200481 +0100
-+++ qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h   2015-02-19 22:12:45.290535475 +0100
+--- qbittorrent-3.1.11/src/core/qtlibtorrent/qbtsession.h.orig 2015-02-19 22:16:34.767200481 +0100
++++ qbittorrent-3.1.11/src/core/qtlibtorrent/qbtsession.h      2015-02-19 22:12:45.290535475 +0100
 @@ -43,9 +43,11 @@
  #include <QTimer>
  #include <QNetworkCookie>
@@ -12,8 +12,8 @@
  
  #include "qtracker.h"
  #include "qtorrenthandle.h"
---- qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h~  2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h   2015-02-19 22:18:32.677199626 +0100
+--- qbittorrent-3.1.11/src/core/qtlibtorrent/filterparserthread.h~     2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/qtlibtorrent/filterparserthread.h      2015-02-19 22:18:32.677199626 +0100
 @@ -37,8 +37,10 @@
  #include <QStringList>
  #include <QHostAddress>
@@ -25,8 +25,8 @@
  
  using namespace std;
  
---- qbittorrent-3.1.11/src/preferences/options_imp.cpp~        2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/preferences/options_imp.cpp 2015-02-19 22:19:55.923865690 +0100
+--- qbittorrent-3.1.11/src/core/preferences/options_imp.cpp~   2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/preferences/options_imp.cpp    2015-02-19 22:19:55.923865690 +0100
 @@ -38,7 +38,9 @@
  #include <QTranslator>
  #include <QDesktopServices>
@@ -37,8 +37,8 @@
  
  #include "options_imp.h"
  #include "preferences.h"
---- qbittorrent-3.1.11/src/preferences/options_imp.h~  2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/preferences/options_imp.h   2015-02-19 22:20:37.453865390 +0100
+--- qbittorrent-3.1.11/src/core/preferences/options_imp.h~     2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/preferences/options_imp.h      2015-02-19 22:20:37.453865390 +0100
 @@ -32,7 +32,9 @@
  #define OPTIONS_IMP_H
  
@@ -49,8 +49,8 @@
  
  // actions on double-click on torrents
  enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
---- qbittorrent-3.1.11/src/properties/peeraddition.h~  2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/properties/peeraddition.h   2015-02-19 22:22:30.387197906 +0100
+--- qbittorrent-3.1.11/src/core/properties/peeraddition.h~     2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/properties/peeraddition.h      2015-02-19 22:22:30.387197906 +0100
 @@ -36,7 +36,9 @@
  #include <QMessageBox>
  #include <QHostAddress>
@@ -61,8 +61,8 @@
  
  #include <boost/version.hpp>
  #if BOOST_VERSION < 103500
---- qbittorrent-3.1.11/src/geoip/geoipmanager.h~       2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/geoip/geoipmanager.h        2015-02-19 22:24:06.623863876 +0100
+--- qbittorrent-3.1.11/src/core/geoip/geoipmanager.h~  2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/geoip/geoipmanager.h   2015-02-19 22:24:06.623863876 +0100
 @@ -31,7 +31,9 @@
  #ifndef GEOIPMANAGER_H
  #define GEOIPMANAGER_H
@@ -73,8 +73,8 @@
  #include <QString>
  #include <QIcon>
  
---- qbittorrent-3.1.11/src/trackerlogin.h~     2014-10-22 21:45:31.000000000 +0200
-+++ qbittorrent-3.1.11/src/trackerlogin.h      2015-02-19 22:25:55.037196425 +0100
+--- qbittorrent-3.1.11/src/core/trackerlogin.h~        2014-10-22 21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/core/trackerlogin.h 2015-02-19 22:25:55.037196425 +0100
 @@ -33,7 +33,9 @@
  
  #include <QDialog>

diff --git a/qbittorrent.spec b/qbittorrent.spec
index 8d041905b35f59e1f268590ca4e0f6d963b26ea0..eaa3593629f53a81b6709b699a890da5ebb6cf66 100644 (file)
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -7,15 +7,14 @@ Summary:      qbittorrent - Qt4-based torrent client
 Summary(hu.UTF-8):     qbittorrent - Qt4-alapú torrent kliens
 Summary(pl.UTF-8):     qbittorrent - graficzny klient torrenta oparty na Qt4
 Name:          qbittorrent
-Version:       3.1.11
-Release:       2
+Version:       3.2.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/qbittorrent/%{name}-%{version}.tar.gz
-# Source0-md5: fcdcb9c0d42d040ead66d1a9cf33cd28
+# Source0-md5: e058c999877317da3cc30d86782b0f54
 Patch0:                lang-hu-2.3.0.patch
-Patch1:                cxx.patch
-Patch2:                boost-moc.patch
+Patch1:                boost-moc.patch
 URL:           http://qbittorrent.sourceforge.net/
 BuildRequires: GeoIP-devel
 BuildRequires: QtCore-devel >= %{qtver}
@@ -27,8 +26,7 @@ BuildRequires:        QtSvg-devel >= %{qtver}
 BuildRequires: QtXml-devel >= %{qtver}
 BuildRequires: boost-devel >= 1.36.0
 BuildRequires: libnotify-devel >= 0.4.2
-BuildRequires: libtorrent-rasterbar-devel >= 1:0.15.9
-BuildRequires: libtorrent-rasterbar-devel <= 1:0.16.17
+BuildRequires: libtorrent-rasterbar-devel >= 1:1.0.0
 BuildRequires: pkgconfig
 BuildRequires: qt4-build >= %{qtver}
 BuildRequires: qt4-linguist >= %{qtver}
@@ -36,7 +34,6 @@ BuildRequires:        qt4-qmake >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.129
 BuildRequires: which
 Requires:      desktop-file-utils
-Requires:      libtorrent-rasterbar >= 1:0.15.9
 Requires:      python >= 1:2.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,10 +50,9 @@ qTorrent - graficzny klient torrenta oparty na Qt4.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if %{with qsa}
-%{__rm} -r src/qtsingleapp
+#%{__rm} -r src/qtsingleapp
 %endif
 
 %build
@@ -84,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc NEWS AUTHORS TODO Changelog
 %attr(755,root,root) %{_bindir}/qbittorrent
+%{_datadir}/appdata/qBittorrent.appdata.xml
 %{_mandir}/man1/qbittorrent.1*
 %{_iconsdir}/hicolor/*/apps/qbittorrent.png
 %{_desktopdir}/qBittorrent.desktop