From 19fbc3f6e4650a82d08152546365a9c7e7114ab0 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jun 14 2015 08:44:20 +0000 Subject: Don't remove _build directory, it is used during debuginfo extracting At the same time don't include _build directory in devel subpackage. - resolves: #1231486 --- diff --git a/golang-github-docker-libcontainer.spec b/golang-github-docker-libcontainer.spec index 91733ff..343aaaf 100644 --- a/golang-github-docker-libcontainer.spec +++ b/golang-github-docker-libcontainer.spec @@ -27,7 +27,7 @@ Name: golang-github-docker-libcontainer Version: 2.1.1 -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} Summary: Configuration options for containers License: ASL 2.0 URL: https://%{import_path} @@ -141,12 +141,17 @@ install -d %{buildroot}%{_bindir} install -p -m 755 bin/nsinit %{buildroot}%{_bindir}/nsinit %if 0%{?with_devel} -rm -rf _build sample_configs vendor bin +rm -rf sample_configs vendor bin install -d -p %{buildroot}%{gopath}/src/%{import_path} cp -rpav ./*.go %{buildroot}%{gopath}/src/%{import_path}/ -for dir in */ ; do - cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/ +for file in */ ; do + if [ "$file" == "_build/" ]; then + continue + fi + if [ -d $file ]; then + cp -rpav $file %{buildroot}%{gopath}/src/%{import_path}/ + fi done %endif @@ -197,6 +202,11 @@ go test %{import_path}/xattr %endif %changelog +* Sun Jun 14 2015 jchaloup - 2.1.1-0.2.gitc964368 +- Don't remove _build directory, it is used during debuginfo extracting + At the same time don't include _build directory in devel subpackage. + resolves: #1231486 + * Thu Jun 11 2015 jchaloup - 2.1.1-0.1.gitc964368 - Update to 2.1.1 Ppolish spec file