besser82 pushed to shogun-data (master). "updated to new snapshot git20150421.b405c1ded32b34e3855853bfb7da6f2ded2bf50a (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 24 08:52:29 UTC 2015


>From 3e935e9166b0a1f3c9ab5be6dbe18f0f50e40f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser at gmail.com>
Date: Fri, 24 Apr 2015 10:51:24 +0200
Subject: updated to new snapshot
 git20150421.b405c1ded32b34e3855853bfb7da6f2ded2bf50a use rpm-defined macros
 for tool invocation


diff --git a/shogun-data.spec b/shogun-data.spec
index 1fb3b60..91a7035 100644
--- a/shogun-data.spec
+++ b/shogun-data.spec
@@ -1,12 +1,12 @@
 # Conditional for release and snapshot builds. Uncomment for release-builds.
-%global rel_build 1
+#global rel_build 1
 
 # Place rpm-macros into proper location.
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 # Settings used for build from snapshots.
-%{!?rel_build:%global commit		6b305d33b9af2111dacaefa6e84fe70f6cea932f}
-%{!?rel_build:%global commit_date	20141224}
+%{!?rel_build:%global commit		b405c1ded32b34e3855853bfb7da6f2ded2bf50a}
+%{!?rel_build:%global commit_date	20150421}
 %{!?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}}
@@ -18,8 +18,8 @@
 %global mainprg shogun
 
 Name:			%{mainprg}-data
-Version:		0.9
-Release:		1%{?gitrel}%{?dist}
+Version:		0.9.1
+Release:		0.1%{?gitrel}%{?dist}
 Summary:		Data-files for the SHOGUN machine learning toolbox
 %{?el5:Group:		Documentation}
 
@@ -31,7 +31,7 @@ URL:			http://%{mainprg}-toolbox.org
 %{!?rel_build:Source0:	https://github.com/%{mainprg}-toolbox/%{name}/archive/%{commit}.tar.gz#/%{gittar}}
 
 BuildArch:		noarch
-%{?el5:BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
+%{?el5:BuildRoot:	%(/bin/mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
 
 %description
 This package contains data-files needed for running the testsuite and
@@ -42,11 +42,11 @@ examples of the SHOGUN machine learning toolbox.
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
 # Move some documentation to toplevel.
-mv easysvm/README README.easysvm
-mv faces/README LICENSE
+%{__mv} easysvm/README README.easysvm
+%{__mv} faces/README LICENSE
 
 # Make sure all files are mode 0644.
-find . -type f -print0 | xargs -0 chmod 0644
+/usr/bin/find . -type f -print0 | /usr/bin/xargs -0 %{__chmod} -c 0644
 
 
 %build
@@ -54,20 +54,22 @@ find . -type f -print0 | xargs -0 chmod 0644
 
 
 %install
-%{?el5:rm -rf %{buildroot}}
-mkdir -p %{buildroot}/%{_datadir}/%{mainprg}/data
-cp -a */ %{buildroot}/%{_datadir}/%{mainprg}/data
+%{?el5:%{__rm} -rf %{buildroot}}
+%{__mkdir} -p %{buildroot}/%{_datadir}/%{mainprg}/data	\
+		%{buildroot}/%{macrosdir}
+%{__cp} -a */ %{buildroot}/%{_datadir}/%{mainprg}/data
 
 # Create a macro for use in other spec-files.
-mkdir -p %{buildroot}/%{macrosdir}
-cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
+%{__cat} << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
 %_%{mainprg}_data_dir %{_datadir}/%{mainprg}/data
 %_%{mainprg}_data_version %{version}-%{release}
 EOF
 
 
-%{?el5:%clean}
-%{?el5:rm -rf %{buildroot}}
+%if 0%{?rhel} && 0%{?rhel} <= 5
+%clean
+%{__rm} -rf %{buildroot}
+%endif # 0%%{?rhel} && 0%%{?rhel} <= 5
 
 
 %files
@@ -77,6 +79,10 @@ EOF
 
 
 %changelog
+* Fri Apr 24 2015 Björn Esser <bjoern.esser at gmail.com> - 0.9.1-0.1.git20150421.b405c1d
+- updated to new snapshot git20150421.b405c1ded32b34e3855853bfb7da6f2ded2bf50a
+- use rpm-defined macros for tool invocation
+
 * Tue Jan 27 2015 Björn Esser <bjoern.esser at gmail.com> - 0.9-1
 - new upstream release
 
diff --git a/sources b/sources
index 2248a11..74a462d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40bc0a1d089c7431f62a3150411242fd  shogun-data-0.9.tar.bz2
+45601512049b33d578856c37b15d8c1d  shogun-data-0.9.1-git20150421-b405c1d.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/shogun-data.git/commit/?h=master&id=3e935e9166b0a1f3c9ab5be6dbe18f0f50e40f0a


More information about the scm-commits mailing list