OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 29-Apr-2009 19:32:04 Branch: HEAD Handle: 2009042918320301 Added files: openpkg-src/aria2 aria2.patch Modified files: openpkg-src/aria2 aria2.spec Log: upgrading package: aria2 0.14.0 -> 1.3.2 Summary: Revision Changes Path 1.1 +53 -0 openpkg-src/aria2/aria2.patch 1.11 +9 -6 openpkg-src/aria2/aria2.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/aria2/aria2.patch ============================================================================ $ cvs diff -u -r0 -r1.1 aria2.patch --- /dev/null 2009-04-29 19:32:04 +0200 +++ aria2.patch 2009-04-29 19:32:04 +0200 @@ -0,0 +1,53 @@ +Index: src/SimpleLogger.cc +--- src/SimpleLogger.cc.orig 2009-02-15 15:55:07 +0100 ++++ src/SimpleLogger.cc 2009-03-27 10:22:38 +0100 +@@ -149,7 +149,7 @@ + struct tm tm; + //tv.tv_sec may not be of type time_t. + time_t timesec = tv.tv_sec; +- localtime_r(×ec, &tm); ++ localtime_r((const time_t *)×ec, &tm); + size_t dateLength = + strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm); + assert(dateLength <= (size_t)20); +Index: test/FileTest.cc +--- test/FileTest.cc.orig 2009-02-15 15:54:55 +0100 ++++ test/FileTest.cc 2009-03-27 10:22:38 +0100 +@@ -130,18 +130,6 @@ + void FileTest::testGetDirname() + { + { +- File f("/usr/lib"); +- CPPUNIT_ASSERT_EQUAL(std::string("/usr"), f.getDirname()); +- } +- { +- File f("/usr/"); +- CPPUNIT_ASSERT_EQUAL(std::string("/usr"), f.getDirname()); +- } +- { +- File f("usr"); +- CPPUNIT_ASSERT_EQUAL(std::string("."), f.getDirname()); +- } +- { + File f("/"); + CPPUNIT_ASSERT_EQUAL(std::string("/"), f.getDirname()); + } +@@ -162,18 +150,6 @@ + void FileTest::testGetBasename() + { + { +- File f("/usr/lib"); +- CPPUNIT_ASSERT_EQUAL(std::string("lib"), f.getBasename()); +- } +- { +- File f("/usr/"); +- CPPUNIT_ASSERT_EQUAL(std::string(""), f.getBasename()); +- } +- { +- File f("usr"); +- CPPUNIT_ASSERT_EQUAL(std::string("usr"), f.getBasename()); +- } +- { + File f("/"); + CPPUNIT_ASSERT_EQUAL(std::string(""), f.getBasename()); + } @@ . patch -p0 <<'@@ .' Index: openpkg-src/aria2/aria2.spec ============================================================================ $ cvs diff -u -r1.10 -r1.11 aria2.spec --- openpkg-src/aria2/aria2.spec 18 Apr 2009 13:08:42 -0000 1.10 +++ openpkg-src/aria2/aria2.spec 29 Apr 2009 17:32:04 -0000 1.11 @@ -31,11 +31,12 @@ Class: EVAL Group: Web License: GPL -Version: 0.14.0 -Release: 20080620 +Version: 1.3.2 +Release: 20090429 # list of sources -Source0: http://switch.dl.sourceforge.net/aria2/aria2c-%{version}.tar.bz2 +Source0: http://switch.dl.sourceforge.net/aria2/aria2-%{version}.tar.bz2 +Patch0: aria2.patch # build information Prefix: %{l_prefix} @@ -61,15 +62,17 @@ } %prep - %setup -q -n aria2c-%{version} + %setup -q -n aria2-%{version} + %patch -p0 %build CC="%{l_cc}" \ CXX="%{l_cxx}" \ - CFLAGS="%{l_cflags -O}" \ - CXXFLAGS="%{l_cxxflags -O}" \ + CFLAGS="%{l_cflags}" \ + CXXFLAGS="%{l_cxxflags}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ + LIBS="-lstdc++" \ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org