upstream release 1.16.1

This commit is contained in:
Rahul Sundaram 2013-01-25 17:27:21 -05:00
parent 2a32e839e7
commit 35785c585a
4 changed files with 8 additions and 70 deletions

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ aria2-1.10.0.tar.xz
/aria2-1.12.1.tar.xz
/aria2-1.14.0.tar.xz
/aria2-1.14.2.tar.xz
/aria2-1.16.1.tar.xz

View file

@ -1,64 +0,0 @@
diff -up aria2-1.14.2/src/DHTConnection.h.gcc47 aria2-1.14.2/src/DHTConnection.h
--- aria2-1.14.2/src/DHTConnection.h.gcc47 2012-03-21 16:40:43.254890487 -0400
+++ aria2-1.14.2/src/DHTConnection.h 2012-03-21 16:40:50.808828820 -0400
@@ -37,6 +37,7 @@
#include "common.h"
#include <string>
+#include <unistd.h>
namespace aria2 {
diff -up aria2-1.14.2/src/util.h.gcc47 aria2-1.14.2/src/util.h
--- aria2-1.14.2/src/util.h.gcc47 2012-03-21 16:37:18.889559038 -0400
+++ aria2-1.14.2/src/util.h 2012-03-21 16:37:54.340269569 -0400
@@ -111,6 +111,24 @@ std::string nativeToUtf8(const std::stri
namespace util {
+extern const std::string DEFAULT_STRIP_CHARSET;
+
+template<typename InputIterator>
+std::pair<InputIterator, InputIterator> stripIter
+(InputIterator first, InputIterator last,
+ const std::string& chars = DEFAULT_STRIP_CHARSET)
+{
+ for(; first != last &&
+ std::find(chars.begin(), chars.end(), *first) != chars.end(); ++first);
+ if(first == last) {
+ return std::make_pair(first, last);
+ }
+ InputIterator left = last-1;
+ for(; left != first &&
+ std::find(chars.begin(), chars.end(), *left) != chars.end(); --left);
+ return std::make_pair(first, left+1);
+}
+
template<typename InputIterator>
void divide
(std::pair<std::pair<InputIterator, InputIterator>,
@@ -161,24 +179,6 @@ std::string itos(int64_t value, bool com
int64_t difftv(struct timeval tv1, struct timeval tv2);
int32_t difftvsec(struct timeval tv1, struct timeval tv2);
-extern const std::string DEFAULT_STRIP_CHARSET;
-
-template<typename InputIterator>
-std::pair<InputIterator, InputIterator> stripIter
-(InputIterator first, InputIterator last,
- const std::string& chars = DEFAULT_STRIP_CHARSET)
-{
- for(; first != last &&
- std::find(chars.begin(), chars.end(), *first) != chars.end(); ++first);
- if(first == last) {
- return std::make_pair(first, last);
- }
- InputIterator left = last-1;
- for(; left != first &&
- std::find(chars.begin(), chars.end(), *left) != chars.end(); --left);
- return std::make_pair(first, left+1);
-}
-
template<typename InputIterator>
InputIterator lstripIter
(InputIterator first, InputIterator last, char ch)

View file

@ -1,14 +1,13 @@
%define binname aria2c
Name: aria2
Version: 1.14.2
Release: 2%{?dist}
Version: 1.16.1
Release: 1%{?dist}
Summary: High speed download utility with resuming and segmented downloading
Group: Applications/Internet
License: GPLv2+ with exceptions
URL: http://aria2.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Patch0: aria2-1.14.2-gcc47.patch
BuildRequires: bison
BuildRequires: c-ares-devel cppunit-devel
BuildRequires: gettext gnutls-devel
@ -38,7 +37,6 @@ Currently it has following features:
%prep
%setup -q
%patch0 -p1 -b .gcc47
%build
%configure --enable-bittorrent \
@ -63,12 +61,15 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
%files -f %{name}.lang
%doc AUTHORS ChangeLog COPYING README doc/aria2c.1.html
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{binname}
%{_mandir}/man1/aria2c.1.gz
%{_mandir}/*/man1/aria2c.1.gz
%changelog
* Fri Jan 25 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1.16.1-1
- upstream release 1.16.1
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View file

@ -1 +1 @@
906b91451a55bb101d86461356b2923c aria2-1.14.2.tar.xz
74064cbcfcc0d26946bdd7e7a4bf4117 aria2-1.16.1.tar.xz