leigh123linux pushed to qbittorrent (f20). "update to the latest git (RC1)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun May 10 05:53:16 UTC 2015


From 0486e9a66d412d0379efbca2725325a8b96657c2 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Sun, 3 May 2015 11:33:15 +0100
Subject: update to the latest git (RC1)


diff --git a/.gitignore b/.gitignore
index 372660b..265ca7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /qbittorrent-3.2.0.gitb0f767e.tar.gz
 /qbittorrent-3.2.0.git060d3fc.tar.gz
 /qbittorrent-3.2.0.git866f965.tar.gz
+/qbittorrent-3.2.0.git6e4fbcf.tar.gz
diff --git a/0001-make-path-absolute.patch b/0001-make-path-absolute.patch
deleted file mode 100644
index ffd5237..0000000
--- a/0001-make-path-absolute.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6e3560820e48ee0ebe0c32220f6d6941b27b51fe Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux at googlemail.com>
-Date: Sun, 26 Apr 2015 22:11:58 +0100
-Subject: [PATCH] make path absolute
-
----
- dist/unix/systemd/qbittorrent-nox.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dist/unix/systemd/qbittorrent-nox.service b/dist/unix/systemd/qbittorrent-nox.service
-index 981ebb2..8a4d475 100644
---- a/dist/unix/systemd/qbittorrent-nox.service
-+++ b/dist/unix/systemd/qbittorrent-nox.service
-@@ -5,7 +5,7 @@ After=network.target
- [Service]
- Type=forking
- User=1000
--ExecStart=qbittorrent-nox -d
-+ExecStart=/usr/bin/qbittorrent-nox -d
- 
- [Install]
- WantedBy=multi-user.target
--- 
-1.9.3
-
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 5b4e715..ff7b37d 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -1,10 +1,10 @@
 #global _hardened_build 1
-%global _internal_version 866f965
+%global _internal_version 6e4fbcf
 
 Name:    qbittorrent
 Summary: A Bittorrent Client
 Version: 3.2.0
-Release: 0.15.git%{_internal_version}%{?dist}
+Release: 0.16.git%{_internal_version}%{?dist}
 Epoch:   1
 License: GPLv2+
 URL:     http://sourceforge.net/projects/qbittorrent
@@ -17,7 +17,6 @@ Source2: qbittorrent-nox
 
 Patch0:  build_flags.patch
 Patch1:  remove-donate.patch
-Patch2:  0001-make-path-absolute.patch
 
 BuildRequires: qt4-devel
 BuildRequires: desktop-file-utils
@@ -50,7 +49,6 @@ It aims to be as fast as possible and to provide multi-OS, unicode support.
 %setup -q -n %{name}-qBittorrent-%{_internal_version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 rm -rf src/qtsingleapp
 rm -rf src/webui/qjson
 cp -p %{SOURCE1} .
@@ -125,6 +123,9 @@ fi
 %{_mandir}/man1/qbittorrent-nox.1*
 
 %changelog
+* Sun May 03 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.16.git6e4fbcf
+- update to the latest git (RC1)
+
 * Sun Apr 26 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.15.git866f965
 - fix systemd file
 
diff --git a/remove-donate.patch b/remove-donate.patch
index 91e8b54..2627e9b 100644
--- a/remove-donate.patch
+++ b/remove-donate.patch
@@ -1,6 +1,6 @@
 --- a/src/gui/mainwindow.h
 +++ b/src/gui/mainwindow.h
-@@ -214,7 +214,6 @@ private slots:
+@@ -215,7 +215,6 @@
      void on_actionSpeed_in_title_bar_triggered();
      void on_actionTop_tool_bar_triggered();
      void on_action_Import_Torrent_triggered();
@@ -10,7 +10,7 @@
      void on_actionAutoSuspend_system_toggled(bool );
 --- a/src/gui/mainwindow.cpp
 +++ b/src/gui/mainwindow.cpp
-@@ -142,7 +142,6 @@ MainWindow::MainWindow(QWidget *parent)
+@@ -142,7 +142,6 @@
      actionBottomPriority->setIcon(IconProvider::instance()->getIcon("go-bottom"));
      actionDelete->setIcon(IconProvider::instance()->getIcon("list-remove"));
      actionDocumentation->setIcon(IconProvider::instance()->getIcon("help-contents"));
@@ -18,7 +18,7 @@
      actionExit->setIcon(IconProvider::instance()->getIcon("application-exit"));
      actionIncreasePriority->setIcon(IconProvider::instance()->getIcon("go-up"));
      actionTopPriority->setIcon(IconProvider::instance()->getIcon("go-top"));
-@@ -1505,11 +1504,6 @@ void MainWindow::handleUpdateCheckFinish
+@@ -1526,11 +1525,6 @@
  }
  #endif
  
@@ -40,7 +40,7 @@
      <addaction name="actionCheck_for_updates"/>
      <addaction name="actionAbout"/>
     </widget>
-@@ -348,14 +348,6 @@
+@@ -349,14 +348,6 @@
      <string>Import torrent...</string>
     </property>
    </action>
diff --git a/sources b/sources
index 473c25b..30b47d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fc72f0d4140f84bd398401ee9f41452  qbittorrent-3.2.0.git866f965.tar.gz
+d19d7ca7ef34207c9e5f027e30ad08ba  qbittorrent-3.2.0.git6e4fbcf.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qbittorrent.git/commit/?h=f20&id=0486e9a66d412d0379efbca2725325a8b96657c2


More information about the scm-commits mailing list