diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-08-27 20:18:59 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-09-02 23:53:59 +0200 |
| commit | 440dbe29577b7e6f71c91c21fab072464f110101 (patch) | |
| tree | adbbbd277c85e7d005f7eb275053d0cd53767200 | |
| parent | 4ff7ff8f665b19313a1778de83e44d83c41c42a8 (diff) | |
| download | clufter-440dbe29577b7e6f71c91c21fab072464f110101.tar.gz clufter-440dbe29577b7e6f71c91c21fab072464f110101.tar.xz clufter-440dbe29577b7e6f71c91c21fab072464f110101.zip | |
clufter.spec: prepare grounds for possible pagure.io jump
Open source infrastructure FTW!
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | __root__/setup.py | 7 | ||||
| -rw-r--r-- | misc/clufter.spec | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/__root__/setup.py b/__root__/setup.py index 4e3c871..8f67aab 100644 --- a/__root__/setup.py +++ b/__root__/setup.py @@ -42,6 +42,7 @@ def doraise_py_compile(file, cfile=None, dfile=None, doraise=False): py_compile.compile = doraise_py_compile PREFER_GITHUB = True +PREFER_FORGE = 'github' if PREFER_GITHUB else 'pagure' # alternatively: None DEBUG = getenv("SETUPDEBUG") DBGPFX = str(__file__) @@ -563,12 +564,16 @@ def cond_require(package, *packages, **preferred): url_dict = dict(name=pkg_name, ver=pkg.version) download_url = '' -if PREFER_GITHUB: +if PREFER_FORGE == 'github': url = 'https://github.com/jnpkrn/{name}' if 'git.' in pkg.version: download_url = url + '/tarball/' + pkg.version.partition('git.')[-1] elif pkg.version.split('+')[-1] != 'a': download_url = url + '/tarball/v{ver}' +elif PREFER_FORGE == 'pagure': + url = 'https://pagure.io/{name}' + if pkg.version.split('+')[-1] != 'a': + download_url = 'https://pagure.io/releases/{name}/{name}-{ver}.tar.gz' else: url = 'http://people.redhat.com/jpokorny/pkgs/{name}' if pkg.version.split('+')[-1] != 'a': diff --git a/misc/clufter.spec b/misc/clufter.spec index e01b256..653f9bc 100644 --- a/misc/clufter.spec +++ b/misc/clufter.spec @@ -22,9 +22,9 @@ %else %{!?clufter_source: %global clufter_source %{name}-%{clufter_version}} %endif -%{!?clufter_url_main:%global clufter_url_main https://github.com/jnpkrn/} -%{!?clufter_url_raw: %global clufter_url_raw https://raw.githubusercontent.com/jnpkrn/} -%{!?clufter_url_dist:%global clufter_url_dist https://people.redhat.com/jpokorny/pkgs/} +%{!?clufter_url_main:%global clufter_url_main %{?!pagure:https://github.com/jnpkrn/%{name}}%{?pagure:https://pagure.io/%{name}}} +%{!?clufter_url_raw: %global clufter_url_raw %{?!pagure:https://raw.githubusercontent.com/jnpkrn/%{name}/}%{?pagure:https://pagure.io/%{name}/raw/}} +%{!?clufter_url_dist:%global clufter_url_dist %{?!pagure:https://people.redhat.com/jpokorny/pkgs/%{name}/}%{?pagure:https://pagure.io/releases/%{name}/}} %{!?clufter_pylib: %global clufter_pylib python-%{name}} %{!?clufter_extlib: %global clufter_extlib %{name}-lib} @@ -67,7 +67,7 @@ Release: %{clufter_rel}%{?dist} Group: System Environment/Base Summary: Tool/library for transforming/analyzing cluster configuration formats License: %{clufter_license} -URL: %{clufter_url_main}%{name} +URL: %{clufter_url_main} # autosetup BuildRequires: git @@ -80,12 +80,12 @@ BuildRequires: python-lxml %endif %if "%{clufter_version}" == "%{clufter_version_norm}" -Source0: %{clufter_url_dist}%{name}/%{name}-%{version}.tar.gz +Source0: %{clufter_url_dist}%{name}-%{version}.tar.gz %else Source0: %{clufter_source}.tar.gz # Source0 is created by Source1, just pass particular commit hash # via GITHASH env. variable -Source1: %{clufter_url_raw}%{name}/%{clufter_githash}/misc/run-sdist-per-commit +Source1: %{clufter_url_raw}%{clufter_githash}/%{?pagure:f/}misc/run-sdist-per-commit %endif |