[fatrat] rebase to upstream 1.1.3
jvcelak
jvcelak at fedoraproject.org
Mon Sep 27 11:23:25 UTC 2010
commit 6d4c7810b41cc63d2decdc372b5463cd16384d32
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Mon Sep 27 12:09:21 2010 +0200
rebase to upstream 1.1.3
.gitignore | 4 ++--
fatrat-czshare-icon.patch | 25 +++++++++++++++++++++++++
fatrat-plugins-path.patch | 13 +++++++------
fatrat.spec | 29 ++++++++++++++++++++++-------
sources | 4 ++--
5 files changed, 58 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21ce6c8..313db4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+/fatrat-1.1.3.tar.gz
/fatrat-czshare-1.1.2.tar.gz
-/fatrat-opensubtitles-1.1.2.tar.gz
-/fatrat-1.1.2.tar.gz
+/fatrat-opensubtitles-1.1.3.tar.gz
diff --git a/fatrat-czshare-icon.patch b/fatrat-czshare-icon.patch
new file mode 100644
index 0000000..1e85794
--- /dev/null
+++ b/fatrat-czshare-icon.patch
@@ -0,0 +1,25 @@
+From bfaf0d72b115d5ad3ff0811b8872b59a3bd544b7 Mon Sep 17 00:00:00 2001
+From: Lubos Dolezel <lubos at dolezel.info>
+Date: Wed, 10 Mar 2010 15:22:40 +0100
+Subject: [PATCH] Reflecting an API change
+
+---
+ CzshareDownload.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CzshareDownload.cpp b/CzshareDownload.cpp
+index 7937d8b..0989e8d 100644
+--- a/CzshareDownload.cpp
++++ b/CzshareDownload.cpp
+@@ -38,7 +38,7 @@ void CzshareDownload::globalInit()
+ {
+ SettingsItem si;
+
+- si.icon = QIcon(":/czshare/czshare.png");
++ si.icon = DelayedIcon(":/czshare/czshare.png");
+ si.title = tr("CZshare.com");
+ si.lpfnCreate = SettingsCzshare::create;
+
+--
+1.7.2.3
+
diff --git a/fatrat-plugins-path.patch b/fatrat-plugins-path.patch
index 747d1b8..a73d125 100644
--- a/fatrat-plugins-path.patch
+++ b/fatrat-plugins-path.patch
@@ -1,13 +1,14 @@
library location in Fedora depends on architecture (lib/lib64)
-diff -uNPrp fatrat-1.1.2/config.h.in fatrat-1.1.2.new/config.h.in
---- fatrat-1.1.2/config.h.in 2010-02-12 12:47:31.000000000 +0100
-+++ fatrat-1.1.2.new/config.h.in 2010-09-08 15:28:47.963772361 +0200
-@@ -17,6 +17,6 @@
- #cmakedefine GLOOX_1_0
+diff -u -uNPrp fatrat-1.1.3/config.h.in fatrat-1.1.3.new/config.h.in
+--- fatrat-1.1.3/config.h.in 2010-09-06 11:43:46.000000000 +0200
++++ fatrat-1.1.3.new/config.h.in 2010-09-27 12:14:55.596653999 +0200
+@@ -19,7 +19,7 @@
+ #cmakedefine LIBTORRENT_0_15
#define DATA_LOCATION "${CMAKE_INSTALL_PREFIX}/share/fatrat"
-#define PLUGIN_LOCATION "${CMAKE_INSTALL_PREFIX}/lib/fatrat/plugins"
+#define PLUGIN_LOCATION "${CMAKE_INSTALL_LIBDIR}/fatrat/plugins"
- #endif
+ #ifndef _LARGEFILE64_SOURCE
+ # define _LARGEFILE64_SOURCE
diff --git a/fatrat.spec b/fatrat.spec
index 1a1f268..dcc85d0 100644
--- a/fatrat.spec
+++ b/fatrat.spec
@@ -1,17 +1,21 @@
Name: fatrat
-Version: 1.1.2
+Version: 1.1.3
Release: 1%{?dist}
Summary: Feature-rich download manager
Group: Applications/Internet
License: GPLv2+
URL: http://fatrat.dolezel.info/
+
+%define plugin_czshare_version 1.1.2
+%define plugin_opensubtitles_version %{version}
+
Source0: http://www.dolezel.info/download/data/fatrat/fatrat-%{version}.tar.gz
-Source1: http://www.dolezel.info/download/data/fatrat-czshare/fatrat-czshare-%{version}.tar.gz
-Source2: http://www.dolezel.info/download/data/fatrat-opensubtitles/fatrat-opensubtitles-%{version}.tar.gz
+Source1: http://www.dolezel.info/download/data/fatrat-czshare/fatrat-czshare-%{plugin_czshare_version}.tar.gz
+Source2: http://www.dolezel.info/download/data/fatrat-opensubtitles/fatrat-opensubtitles-%{plugin_opensubtitles_version}.tar.gz
-Patch0: fatrat-gcc-4.5.patch
-Patch1: fatrat-plugins-path.patch
+Patch0: fatrat-plugins-path.patch
Patch100: fatrat-czshare-libdir.patch
+Patch101: fatrat-czshare-icon.patch
Patch200: fatrat-opensubtitles-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +43,9 @@ It is rich in features and is continuously extended. Main characteristics:
- MD4/MD5/SHA1 hash computing
- Remote control via Jabber
- Remote control via a web interface
+- Subtitle search
+- Scheduler
+- Clipboard monitor
%package devel
Summary: Development libraries for fatrat
@@ -83,13 +90,18 @@ ln -s ../fatrat-%{version}/src include/fatrat
# unpack all archives
%setup -q -b 1 -b 2
+# plugin version need not match main application version:
+# workaround this as we are packaging plugins as subpackackages
+ln -s fatrat-czshare-%{plugin_czshare_version} ../fatrat-czshare-%{version}
+ln -s fatrat-opensubtitles-%{plugin_opensubtitles_version} ../fatrat-opensubtitles-%{version}
+
# patches for main application
-%patch0 -p1 -b gcc45
-%patch1 -p1 -b plugins-path
+%patch0 -p1 -b plugins-path
# patches for plugins
cd ../fatrat-czshare-%{version}
%patch100 -p1 -b libdir
+%patch101 -p1 -b icon
cd ../fatrat-opensubtitles-%{version}
%patch200 -p1 -b opensubtitles
@@ -165,5 +177,8 @@ rm -rf %{buildroot}
%{_libdir}/fatrat/plugins/libfatrat-opensubtitles.so
%changelog
+* Mon Sep 27 2010 Jan Vcelak <jvcelak at redhat.com> 1.1.3-1
+- update to latest upstream version
+
* Wed Sep 08 2010 Jan Vcelak <jvcelak at redhat.com> 1.1.2-1
- initial release
diff --git a/sources b/sources
index 44cc91d..d3aaeaa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
627a7b06229d9d61ccc93406eb24c367 fatrat-czshare-1.1.2.tar.gz
-be18bc202dc7646c7b0f2fe0947ed5a8 fatrat-opensubtitles-1.1.2.tar.gz
-4768c2b5837408b114cd25d4d0578a4a fatrat-1.1.2.tar.gz
+980a3eb56a835d51f379f193f3b875a5 fatrat-opensubtitles-1.1.3.tar.gz
+6d4a00cdd0b59a05b1521184508d4637 fatrat-1.1.3.tar.gz
More information about the scm-commits
mailing list