jchaloup pushed to gofed (f20). "Update to version 0.0.3 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat May 9 13:49:22 UTC 2015


From f85e055cd066818e32e9ee88a1db920da95d3975 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Sat, 9 May 2015 13:34:09 +0200
Subject: Update to version 0.0.3 - related: #1204614


diff --git a/.gitignore b/.gitignore
index c777668..e518c6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/gofed-62b0051.tar.gz
+/gofed-58a0975.tar.gz
diff --git a/gofed.spec b/gofed.spec
index 589f41f..bc62e33 100644
--- a/gofed.spec
+++ b/gofed.spec
@@ -3,24 +3,27 @@
 %global provider_tld    com
 %global project        	ingvagabund
 %global repo            gofed
-%global commit		62b0051f440eea9837b89c39fa49667d597b87b4
+%global commit		58a0975dd2426d551105eed988f2690f6e1c96fe
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 Name:		gofed
-Version:	0.0.1
-Release:	0.1.git%{shortcommit}%{?dist}
+Version:	0.0.3
+Release:	1%{?dist}
 Summary:	Tool for development of golang devel packages
 License:	GPLv2+
 URL:		https://github.com/%{project}/%{repo}
 Source0:	https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 ExclusiveArch:  %{ix86} x86_64 %{arm}
 
-BuildRequires: golang, python >= 2.7.5
+BuildRequires: golang, python >= 2.7.5, python-lxml
+
 Requires: python >= 2.7.5, bash, wget, rpmdevtools, rpmlint
 Requires: fedpkg, koji, coreutils, rpm-build, openssh-clients, tar
 Requires: python-PyGithub, bash-completion
+Requires: python-lxml
 Requires: graphviz
 
+
 %description
 Tool to automize packaging of golang devel source codes.
 The main goal is to automatize packaging (spec file generator),
@@ -36,11 +39,11 @@ gobuild parseGo.go
 
 %install
 # copy bash completition
-mkdir -p %{buildroot}/etc/bash_completion.d/
-./gen_bash_completion.sh %{name} > %{buildroot}/etc/bash_completion.d/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
+./gen_bash_completion.sh %{name} > %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
 # copy man page
-mkdir -p %{buildroot}/usr/share/man/man1
-cp man/gofed-help.1 %{buildroot}/usr/share/man/man1/gofed.1
+mkdir -p %{buildroot}%{_mandir}/man1
+cp man/gofed-help.1 %{buildroot}/%{_mandir}/man1/gofed.1
 # copy scripts
 mkdir -p %{buildroot}/usr/share/%{name}
 cp bitbucket2gospec.sh gen_bash_completion.sh github2gospec.sh \
@@ -49,44 +52,50 @@ cp *.py %{buildroot}/usr/share/%{name}/.
 cp -r modules %{buildroot}/usr/share/%{name}/.
 cp parseGo %{buildroot}/usr/share/%{name}/.
 # copy config
-mkdir -p %{buildroot}/usr/share/%{name}/config
-cp config/gofed.conf %{buildroot}/usr/share/%{name}/config/.
-# copy golang list and native imports
-cp -r data %{buildroot}/usr/share/%{name}/.
+mkdir -p %{buildroot}%{_sysconfdir}/
+cp config/gofed.conf %{buildroot}%{_sysconfdir}/.
 # copy the tool script
 cp %{name} %{buildroot}/usr/share/%{name}/.
 # directory for local database
-mkdir -p %{buildroot}/var/lib/%{name}
-install -m 755 -d %{buildroot}/var/lib/%{name}
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+install -m 755 -d %{buildroot}/%{_sharedstatedir}/%{name}
 install -m 755 -d %{buildroot}/usr/bin
+# copy golang list and native imports
+cp -r data %{buildroot}%{_sharedstatedir}/%{name}/.
 ln -s /usr/share/%{name}/%{name} %{buildroot}/usr/bin/%{name}
 # symlinks
 cp build gcp pull push scratch-build update bbobranches %{buildroot}/usr/share/%{name}/.
 
 %check
-function gofed { %{buildroot}/usr/share/%{name}/%{name} "$@" --dry; }
-gofed scratch-build
-gofed build
-gofed pull
-gofed push
-gofed update
-gofed gcpmaster
-gofed tools --git-reset
-gofed tools --bbo --dry test
-gofed tools --bbo --wait --dry test
-gofed tools --waitbbo --dry test
-gofed wizard --scratch --dry
+if [ -f /etc/gofed.conf ]; then
+	function gofed { %{buildroot}/usr/share/%{name}/%{name} "$@" --dry; }
+	gofed scratch-build
+	gofed build
+	gofed pull
+	gofed push
+	gofed update
+	gofed gcpmaster
+	gofed tools --git-reset
+	gofed tools --bbo --dry test
+	gofed tools --bbo --wait --dry test
+	gofed tools --waitbbo --dry test
+	gofed wizard --scratch --dry
+fi
 
 %files
 %doc README.md LICENSE MANUAL.md
-%config(noreplace) /usr/share/%{name}/config/gofed.conf
-/etc/bash_completion.d/%{name}
+%config(noreplace) /etc/gofed.conf
+%{_sysconfdir}/bash_completion.d/%{name}
 /usr/share/%{name}
-/usr/share/man/man1/gofed.1.gz
-/var/lib/%{name}
+%{_mandir}/man1/gofed.1.gz
+%{_sharedstatedir}/%{name}
 /usr/bin/%{name}
 
 %changelog
+* Sat May 09 2015 jchaloup <jchaloup at redhat.com> - 0.0.3-1
+- Update to version 0.0.3
+  related: #1204614
+
 * Thu Apr 02 2015 jchaloup <jchaloup at redhat.com> - 0.0.1-0.1.git62b0051
 - Update to version 0.0.1
   related: #1204614
diff --git a/sources b/sources
index 5aa1f94..83ce4c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23b3c0b5113bb205170140fb58accb28  gofed-62b0051.tar.gz
+e09c8412033d42244455c7ed4cf9c91d  gofed-58a0975.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gofed.git/commit/?h=f20&id=f85e055cd066818e32e9ee88a1db920da95d3975


More information about the scm-commits mailing list