[shogun/el5] new upstream release: v3.1.1
by Björn 'besser82' Esser
commit 1a24c0c053102e7282bfe322a99b2175c7b917a5
Author: Björn Esser <bjoern.esser(a)gmail.com>
Date: Mon Jan 6 11:37:06 2014 +0100
new upstream release: v3.1.1
shogun.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index 77c74d2..40cac8a 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -1,5 +1,5 @@
# Conditional for release and snapshot builds. Uncomment for release-builds.
-# %%global rel_build 1
+%global rel_build 1
# Settings used for build from snapshots.
%{!?rel_build:%global commit 1c7fbaa732c8476b2df26bca2ae93de666959092}
@@ -85,8 +85,8 @@ of it's 'no-redistribute', 'no-commercial-use' license.
###############################################################################
Name: shogun
-Version: %{branch}.0
-Release: 0.13%{?gitrel}%{?dist}
+Version: %{branch}.1
+Release: 1%{?gitrel}%{?dist}
Summary: Large Scale Machine Learning Toolbox
# ===== License-breakdown =====
@@ -940,6 +940,10 @@ popd
###############################################################################
%changelog
+* Mon Jan 06 2014 Björn Esser <bjoern.esser(a)gmail.com> - 3.1.1-1
+- new upstream release: v3.1.1
+- data-files are now moved into a separate package
+
* Sat Dec 28 2013 Björn Esser <bjoern.esser(a)gmail.com> - 3.1.0-0.13.git20131226.1c7fbaa
- rebuild for octave-3.8.0-rc2
10 years, 3 months
[shogun/el5] data-files are now moved into a separate package
by Björn 'besser82' Esser
commit 3ab36ecf85e084e6905cfca64c945dd424d3ce84
Author: Björn Esser <bjoern.esser(a)gmail.com>
Date: Mon Jan 6 11:31:21 2014 +0100
data-files are now moved into a separate package
shogun.spec | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index cf81357..77c74d2 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -2,24 +2,20 @@
# %%global rel_build 1
# Settings used for build from snapshots.
-%{!?rel_build:%global commit_src 1c7fbaa732c8476b2df26bca2ae93de666959092}
-%{!?rel_build:%global commit_src_date 20131226}
-%{!?rel_build:%global shortcommit_src %(c=%{commit_src};echo ${c:0:7})}
-%{!?rel_build:%global gitver_src git%{commit_src_date}-%{shortcommit_src}}
-%{!?rel_build:%global gitrel_src .git%{commit_src_date}.%{shortcommit_src}}
-%{!?rel_build:%global gittar_src %{name}-%{version}-%{gitver_src}.tar.gz}
-
-# We need the data-files for the testsuite, too.
-%{!?rel_build:%global commit_data 0bbb04f354a29ed3ab43ce002388b79bb274e886}
-%{!?rel_build:%global commit_data_date 20131222}
-%{!?rel_build:%global shortcommit_data %(c=%{commit_data};echo ${c:0:7})}
-%{!?rel_build:%global gitver_data git%{commit_data_date}-%{shortcommit_data}}
-%{!?rel_build:%global gitrel_data .git%{commit_data_date}.%{shortcommit_data}}
-%{!?rel_build:%global gittar_data %{name}-data-%{version}-%{gitver_data}.tar.gz}
+%{!?rel_build:%global commit 1c7fbaa732c8476b2df26bca2ae93de666959092}
+%{!?rel_build:%global commit_date 20131226}
+%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
+%{!?rel_build:%global gitver git%{commit_date}-%{shortcommit}}
+%{!?rel_build:%global gitrel .git%{commit_date}.%{shortcommit}}
+%{!?rel_build:%global gittar %{name}-%{version}-%{gitver}.tar.gz}
# This is needed, because src-url contains branched part of versioning-scheme.
%global branch 3.1
+# This is needed to set the required version of the data-files for testsuite
+# && example-applications.
+%global data_ver 0.7
+
# Filter all provides from bindings and private libs.
%global __provides_exclude_from ^(%{_libdir}/.*/.*%{name}\\.so|%{_libdir}/libmod%{name}.so)
@@ -90,7 +86,7 @@ of it's 'no-redistribute', 'no-commercial-use' license.
Name: shogun
Version: %{branch}.0
-Release: 0.13%{?gitrel_src}%{?dist}
+Release: 0.13%{?gitrel}%{?dist}
Summary: Large Scale Machine Learning Toolbox
# ===== License-breakdown =====
@@ -151,10 +147,8 @@ License: GPLv3+ and BSD and GPLv2+ and (GPLv2+ or LGPLv2+) and GPLv3 and LGPLv2
URL: http://%{name}-toolbox.org
# Sources for release-builds.
%{?rel_build:Source0: %{url}/archives/%{name}/releases/%{branch}/sources/%{name}-%{version}.tar.bz2}
-%{?rel_build:Source1: %{url}/archives/%{name}/data/%{name}-data-%{version}.tar.bz2}
# Sources for snapshot-builds.
-%{!?rel_build:Source0: https://github.com/%{name}-toolbox/%{name}/archive/%{commit_src}.tar.gz#/...
-%{!?rel_build:Source1: https://github.com/%{name}-toolbox/%{name}-data/archive/%{commit_data}.ta...
+%{!?rel_build:Source0: https://github.com/%{name}-toolbox/%{name}/archive/%{commit}.tar.gz#/%{gi...
Source99: http://googlemock.googlecode.com/files/gmock-1.7.0.zip
BuildRequires: arpack-devel
@@ -178,6 +172,7 @@ BuildRequires: lzo-devel
BuildRequires: NLopt-devel
BuildRequires: protobuf-devel
BuildRequires: qd-devel
+BuildRequires: %{name}-data = %{data_ver}
BuildRequires: snappy-devel
BuildRequires: tapkee-devel
BuildRequires: xz-devel
@@ -580,7 +575,7 @@ This package contains the Ruby-plugin for %{name}.
###############################################################################
%prep
-%setup -q%{!?rel_build:n %{name}-%{commit_src}}
+%setup -q%{!?rel_build:n %{name}-%{commit}}
# Scrub stuff that needs linking to license encumbered libs, which we can't
# ship. Thanks to Dr. Sören Sonnenburg (sonney2k), the upstream author, for
@@ -653,7 +648,7 @@ rm -rf ${_file}.orig
# </LICENSE>
# Remove cluttering stuff and create some needed dirs.
-rm -rf applications build data doc/tutorial py3_build third_party
+rm -rf build data doc/tutorial py3_build third_party
mkdir -p build py3_build third_party/GoogleMock
# Unbundle Tapkee. This is pretty the same as we have in our repos.
@@ -721,19 +716,16 @@ done
echo "# noop" > examples/undocumented/python_modular/tools/__init__.py
# Copy the other sources into tree.
-%setup -TDqa 1 %{!?rel_build:-n %{name}-%{commit_src}}
install -pm 0644 %{SOURCE99} third_party/GoogleMock
# Move data into proper location.
-mv %{name}-data-%{?commit_data}* data
+ln -fs %{_datadir}/%{name}/data data
# Add data to examples, because they need it to be run.
-mkdir -p examples/data
-mv -f data/toy/* examples/data
for _dir in 'documented' 'undocumented'
do
unlink examples/${_dir}/data
- ln -fs ../data examples/${_dir}/
+ ln -fs %{_datadir}/%{name}/data/toy examples/${_dir}/data
done
###############################################################################
10 years, 3 months
Broken dependencies: shogun
by Fedora Koji Build System
shogun has broken dependencies in the rawhide tree:
On x86_64:
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.x86_64 requires octave(api) = 0:api-v48+
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.x86_64 requires liboctinterp.so.1()(64bit)
On i386:
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.i686 requires octave(api) = 0:api-v48+
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.i686 requires liboctinterp.so.1
On armhfp:
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.armv7hl requires octave(api) = 0:api-v48+
octave-shogun-3.1.0-0.12.git20131226.1c7fbaa.fc21.armv7hl requires liboctinterp.so.1
Please resolve this as soon as possible.
10 years, 3 months