diff options
author | Lars Kellogg-Stedman <lars@redhat.com> | 2016-07-22 15:09:24 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-08-03 16:00:52 -0400 |
commit | 72d6adcb2e4cb5911f7809b89835965d4bf04476 (patch) | |
tree | 64b33f605847b5b26f67e37882442ea0c3620552 /packages/redhat | |
parent | eed7fccdb9e59e5b2cc9e6d94af06f075c6ced67 (diff) | |
download | vyos-cloud-init-72d6adcb2e4cb5911f7809b89835965d4bf04476.tar.gz vyos-cloud-init-72d6adcb2e4cb5911f7809b89835965d4bf04476.zip |
Update build tools to work with git
- Update HACKING.rst to include git instructions
- update MANIFEST.in and .gitignore to ignore git-related things
- replaced tarball generation scripts with git-based script
- have the spec files correctly identify themselves as cheetah templates
- make brpm work with git
Diffstat (limited to 'packages/redhat')
-rw-r--r-- | packages/redhat/cloud-init.spec.in | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 254d209b..c30d33ca 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -1,17 +1,13 @@ -## This is a cheetah template +## template: cheetah %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # See: http://www.zarb.org/~jasonc/macros.php # Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html -#for $d in $defines -%define ${d} -#end for - Name: cloud-init Version: ${version} -Release: ${release}${subrelease}%{?dist} +Release: 1${subrelease}%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -22,9 +18,9 @@ Source0: ${archive_name} BuildArch: noarch BuildRoot: %{_tmppath} -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-cheetah +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: python-cheetah # System util packages needed Requires: shadow-utils @@ -68,7 +64,7 @@ need special scripts to run during initialization to retrieve and install ssh keys and to let the user run various scripts. %prep -%setup -q -n %{name}-%{version}~${release} +%setup -q -n ${source_name} # Custom patches activation #set $size = 0 @@ -198,7 +194,3 @@ fi # Python code is here... %{python_sitelib}/* - -%changelog - -${changelog} |