From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 Date: Sun, 11 Mar 2012 18:29:00 +0100 Message-ID: <20120311172900.9B752200D6@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8374863835238800813==" List-Id: --===============8374863835238800813== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 (commit) via cce8982b41830878ccad741214fa2a205e30fe15 (commit) via 20ec0afc327195b17cc2dda711ecfa280b28c55b (commit) from e63d3291910086dffc8e2e82cc9319d3d815c139 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 Author: Michael Tremer Date: Sun Mar 11 18:27:13 2012 +0100 rtorrent: Update to 0.8.9. commit cce8982b41830878ccad741214fa2a205e30fe15 Author: Michael Tremer Date: Sun Mar 11 18:24:54 2012 +0100 libtorrent: Update to 0.12.9. =20 Fixes a build issue with the older version. commit 20ec0afc327195b17cc2dda711ecfa280b28c55b Author: Michael Tremer Date: Sun Mar 11 17:53:08 2012 +0100 compat-db: Fix installation issue. =20 Package compat-db46 could not be installed because of unmet dependencies (#10060). ----------------------------------------------------------------------- Summary of changes: compat-db/compat-db.nm | 11 ++++++----- libtorrent/libtorrent.nm | 7 ++++--- rtorrent/rtorrent.nm | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) Difference in files: diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm index bc9aa06..df91897 100644 --- a/compat-db/compat-db.nm +++ b/compat-db/compat-db.nm @@ -4,8 +4,8 @@ ############################################################################= ### =20 name =3D compat-db -version =3D %{version_db47} -release =3D 4 +version =3D %{main_version} +release =3D 5 thisapp =3D db-%{version} =20 maintainer =3D Michael Tremer @@ -25,6 +25,7 @@ end version_db46 =3D 4.6.21 version_db47 =3D 4.7.25 versions =3D %{version_db47} %{version_db46} +main_version:=3D %{version_db47} =20 source_dl =3D http://download.oracle.com/berkeley-db/ sources =3D db-%{version_db47}.tar.gz @@ -92,8 +93,8 @@ end =20 packages package %{name} - requires +=3D compat-db46 =3D %{version_db46} - requires +=3D compat-db47 =3D %{version_db47} + requires +=3D compat-db46 =3D %{version_db46}-%{_release} + requires +=3D compat-db47 =3D %{version_db47}-%{_release} end =09 template COMPATDB @@ -114,7 +115,7 @@ packages %{libdir}/libdb*-%{version_major}.so end =20 - requires =3D compat-db-headers =3D %{thisver} + requires =3D compat-db-headers =3D %{main_version}-%{_release} obsoletes db4 < 1:%{version_major} db4-devel < 1:%{version_major} diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm index 9cbeb8c..18bf990 100644 --- a/libtorrent/libtorrent.nm +++ b/libtorrent/libtorrent.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D libtorrent -version =3D 0.12.7 +version =3D 0.12.9 release =3D 1 =20 groups =3D Internet/P2P @@ -17,7 +17,7 @@ description focus on high performance and good code. end =20 -source_dl =3D +source_dl =3D http://libtorrent.rakshasa.no/downloads/ =20 build requires @@ -25,11 +25,12 @@ build libsigc++-devel openssl-devel end + + CFLAGS +=3D -fno-strict-aliasing end =20 packages package %{name} - end =20 package %{name}-devel template DEVEL diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm index ae55fe5..6f3f379 100644 --- a/rtorrent/rtorrent.nm +++ b/rtorrent/rtorrent.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D rtorrent -version =3D 0.8.7 +version =3D 0.8.9 release =3D 1 =20 groups =3D Internet/P2P @@ -24,19 +24,20 @@ source_dl =3D http://libtorrent.rakshasa.no/downloads/ =20 build requires - gcc-c++ + gcc-c++ libcurl-devel libsigc++-devel - libtorrent-devel + libtorrent-devel >=3D 0.12.9 ncurses-devel end =20 + CFLAGS +=3D -fno-strict-aliasing + make_build_targets +=3D LDFLAGS=3D-lpthread end =20 packages package %{name} - end =20 package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree --===============8374863835238800813==--