Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit btfs for openSUSE:Factory
Hello community,

here is the log from the commit of package btfs for openSUSE:Factory checked in
at 2019-04-15 11:52:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btfs (Old)
and /work/SRC/openSUSE:Factory/.btfs.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "btfs"

Mon Apr 15 11:52:52 2019 rev:5 rq:694069 version:2.19

Changes:
--------
--- /work/SRC/openSUSE:Factory/btfs/btfs.changes 2017-11-27
22:19:06.245125671 +0100
+++ /work/SRC/openSUSE:Factory/.btfs.new.17052/btfs.changes 2019-04-15
11:52:57.962574920 +0200
@@ -1,0 +2,7 @@
+Sun Apr 14 16:27:17 UTC 2019 - Martin Herkt <9+suse@cirno.systems>
+
+- Modernize spec file
+- 2.19
+ * Add option to set data directory
+
+-------------------------------------------------------------------

Old:
----
_service
v2.18.tar.gz

New:
----
v2.19.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ btfs.spec ++++++
--- /var/tmp/diff_new_pack.Hi8b2y/_old 2019-04-15 11:52:59.898576302 +0200
+++ /var/tmp/diff_new_pack.Hi8b2y/_new 2019-04-15 11:52:59.898576302 +0200
@@ -1,7 +1,7 @@
#
# spec file for package btfs
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,21 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#


Name: btfs
-Version: 2.18
+Version: 2.19
Release: 0
Summary: A BitTorrent file system based on FUSE
-License: GPL-3.0
+License: GPL-3.0-or-later
Group: Productivity/Networking/File-Sharing
-Url: https://github.com/johang/%{name}
+URL: https://github.com/johang/%{name}
Source: https://github.com/johang/%{name}/archive/v%{version}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: gcc
+BuildRequires: c++_compiler
BuildRequires: libboost_system-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(fuse)
@@ -41,19 +41,20 @@

%prep
%setup -q
+sed -i 's,env python,python,' scripts/btplay

%build
autoreconf -fi
%configure
-make %{?_smp_mflags} V=1
+%make_build

%install
%make_install V=1

%files
-%defattr(-,root,root)
-%doc LICENSE README.md
-%{_mandir}/man1/%{name}.1%{ext_man}
+%doc README.md
+%license LICENSE
+%{_mandir}/man1/%{name}.1%{?ext_man}
%{_bindir}/btfs
%{_bindir}/btplay
%{_bindir}/btfsstat

++++++ v2.18.tar.gz -> v2.19.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/.travis.yml new/btfs-2.19/.travis.yml
--- old/btfs-2.18/.travis.yml 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/.travis.yml 2019-03-21 21:29:07.000000000 +0100
@@ -2,11 +2,11 @@
matrix:
include:
- os: linux
- env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7"
+ env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8"
- os: linux
- env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7"
+ env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8"
- os: linux
- env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7"
+ env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8"
- os: osx
env: LIBTORRENT_BRANCH=master
- os: osx
@@ -15,7 +15,7 @@
env: LIBTORRENT_BRANCH=RC_1_0
allow_failures:
- os: linux
- env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7"
+ env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8"
- os: osx
env: LIBTORRENT_BRANCH=master
env:
@@ -33,7 +33,7 @@
- libboost1.55-tools-dev
- libfuse-dev
- libcurl4-openssl-dev
- - g++-7
+ - g++-8
before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/README.md new/btfs-2.19/README.md
--- old/btfs-2.18/README.md 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/README.md 2019-03-21 21:29:07.000000000 +0100
@@ -17,19 +17,19 @@

## Installing on Debian/Ubuntu

- $ sudo apt-get install btfs
+ # apt-get install btfs

## Installing on Arch Linux

- $ sudo pacman -S btfs
+ # pacman -S btfs

## Installing on Gentoo

# emerge -av btfs

-## Installing on OS X
+## Installing on macOS

-BTFS has a formula in the
[`homebrew/homebrew-core`](https://github.com/Homebrew/homebrew-core)
repository, ready to go. Just [install `brew`](https://brew.sh) if you hadn't,
and then
+Use [`brew`](https://brew.sh) to install on macOS.

$ brew install btfs

@@ -50,11 +50,11 @@

And optionally, if you want to install it:

- $ sudo make install
+ $ make install

-## Building on OS X
+## Building on macOS

-Use `brew` to get the dependencies and clone the project.
+Use [`brew`](https://brew.sh) to get the dependencies.

$ brew install Caskroom/cask/osxfuse libtorrent-rasterbar autoconf
automake pkg-config
$ git clone https://github.com/johang/btfs.git btfs
@@ -65,4 +65,4 @@

And optionally, if you want to install it:

- # make install
+ $ make install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/configure.ac new/btfs-2.19/configure.ac
--- old/btfs-2.18/configure.ac 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/configure.ac 2019-03-21 21:29:07.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
-AC_INIT(btfs, 2.17, johan.gunnarsson@xxxxxxxxx, btfs,
https://github.com/johang/btfs)
+AC_INIT(btfs, 2.18, johan.gunnarsson@xxxxxxxxx, btfs,
https://github.com/johang/btfs)
AC_CONFIG_SRCDIR([src/btfs.cc])

AM_INIT_AUTOMAKE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/man/btfs.1 new/btfs-2.19/man/btfs.1
--- old/btfs-2.18/man/btfs.1 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/man/btfs.1 2019-03-21 21:29:07.000000000 +0100
@@ -25,6 +25,9 @@
\fB\-k\fR \fB\-\-keep\fR
keep files after unmount
.TP
+\fB\-\-data-directory=\fIDIRECTORY\fR
+directory in which to put btfs download data. default is $HOME/btfs, or
/tmp/btfs if unavailable
+.TP
\fB\-\-min-port=\fIPORT\fR
start of listen port range
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/src/btfs.cc new/btfs-2.19/src/btfs.cc
--- old/btfs-2.18/src/btfs.cc 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/src/btfs.cc 2019-03-21 21:29:07.000000000 +0100
@@ -789,7 +789,7 @@
else
perror("Failed to expand target");

- free(x);
+ free(x);
} else {
perror("Failed to generate target");
}
@@ -917,6 +917,7 @@
BTFS_OPT("--browse-only", browse_only, 1),
BTFS_OPT("-k", keep, 1),
BTFS_OPT("--keep", keep, 1),
+ BTFS_OPT("--data-directory=%s", data_directory, 4),
BTFS_OPT("--min-port=%lu", min_port, 4),
BTFS_OPT("--max-port=%lu", max_port, 4),
BTFS_OPT("--max-download-rate=%lu", max_download_rate, 4),
@@ -952,6 +953,7 @@
printf(" --help-fuse print all fuse options\n");
printf(" --browse-only -b download metadata only\n");
printf(" --keep -k keep files after unmount\n");
+ printf(" --data-directory=dir directory in which to put btfs
data\n");
printf(" --min-port=N start of listen port range\n");
printf(" --max-port=N end of listen port range\n");
printf(" --max-download-rate=N max download rate (in kB/s)\n");
@@ -1022,7 +1024,7 @@

std::string target;

- if (!populate_target(target, NULL))
+ if (!populate_target(target, params.data_directory))
return -1;

libtorrent::add_torrent_params p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.18/src/btfs.h new/btfs-2.19/src/btfs.h
--- old/btfs-2.18/src/btfs.h 2017-11-25 12:40:12.000000000 +0100
+++ new/btfs-2.19/src/btfs.h 2019-03-21 21:29:07.000000000 +0100
@@ -123,6 +123,7 @@
int help_fuse;
int browse_only;
int keep;
+ char *data_directory;
int min_port;
int max_port;
int max_download_rate;


< Previous Next >
This Thread
  • No further messages