Skip to content

Commit

Permalink
Merge pull request #233 from jnpkrn/copr-tito
Browse files Browse the repository at this point in the history
build: git -> automatic COPR builds integration followup
  • Loading branch information
chrissie-c authored Nov 24, 2016
2 parents 45712ea + 77cb88d commit 3ca533b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
9 changes: 1 addition & 8 deletions .tito/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# All rights reserved.
#
# Author: Jan Pokorny <[email protected]>
# (using src/tito/builder from the tito project as a template)
# (using src/tito/builder/fetch.py from the tito project as a template)
#
# libqb is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
Expand Down Expand Up @@ -70,10 +70,3 @@ def tgz(self):
dest_filepath = join(self.rpmbuild_sourcedir, base_name)
copyfile(s, dest_filepath)
self.sources.append(dest_filepath)

def _get_rpmbuild_dir_options(self):
return ('--define "_topdir %s" --define "_sourcedir %s" --define "_builddir %s" '
'--define "_srcrpmdir %s" --define "_rpmdir %s" ' % (
self.rpmbuild_dir,
self.rpmbuild_sourcedir, self.rpmbuild_builddir,
self.rpmbuild_basedir, self.rpmbuild_basedir))
4 changes: 2 additions & 2 deletions .tito/tito.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ lib_dir = .tito

[builder]
fetch_prep_command = $(test $(id -u) -eq 0 || echo :) \
&& $(which dnf && echo dnf || echo yum) install -y \
autoconf automake libtool \
$(dnf >/dev/null 2>&1 && echo dnf || echo yum) \
install -y autoconf automake libtool \
&& ./autogen.sh && ./configure \
&& make libqb.spec dist-xz
1 change: 1 addition & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ focused APIs that are highly tuned for maximum performance for client-server
applications.

[![Build Status](https://travis-ci.org/ClusterLabs/libqb.png)](https://travis-ci.org/ClusterLabs/libqb)
[![COPR Build Status](https://copr.fedorainfracloud.org/coprs/g/ClusterLabs/devel/package/libqb/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/g/ClusterLabs/devel/package/libqb/)

## For more information, see:
* [libqb wiki](https://github.com/clusterlabs/libqb/wiki)
Expand Down

0 comments on commit 3ca533b

Please sign in to comment.