From dc32b0e437342f98504b3c92462b6b5d93ecff4b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Nov 05 2017 23:41:00 +0000 Subject: Rebase to 0.161.1 --- diff --git a/.gitignore b/.gitignore index b2d7782..0d9e2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /osc-0.154.0.tar.gz /osc-0.155.0.tar.gz /osc-0.157.1.tar.gz +/osc-0.161.1.tar.gz diff --git a/osc.spec b/osc.spec index a35e275..c030d33 100644 --- a/osc.spec +++ b/osc.spec @@ -1,16 +1,19 @@ # SUSE guys use OBS to automatically handle release numbers, # when rebasing check what they are using on -# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_24/ +# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_26/ # update the obsrel to match the upstream release number -%global obsrel 202.1 +%global obsrel 224.1 + +# osc plugin support +%global osc_plugin_dir %{_prefix}/lib/osc-plugins # Real release number %global rel 1 Name: osc -Version: 0.157.1 +Version: 0.161.1 # Bump the release as necessary to ensure we're one level up from upstream -Release: %{obsrel}.%{rel}%{?dist}.1 +Release: %{obsrel}.%{rel}%{?dist} Group: Development/Tools License: GPLv2+ Url: https://github.com/openSUSE/osc @@ -60,18 +63,33 @@ install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh install -Dm0644 dist/complete.sh %{buildroot}%{_datadir}/bash-completion/completions/osc install -Dm0755 dist/osc.complete %{buildroot}%{_datadir}/osc/complete +mkdir -p %{buildroot}%{osc_plugin_dir} + +mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ + +# osc rpm macros +cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.osc < - 0.161.1-224.1.1 +- Rebase to 0.161.1 + * Thu Jul 27 2017 Fedora Release Engineering - 0.157.1-202.1.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 1c25bf9..a1ddd8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osc-0.157.1.tar.gz) = 7b22de0e801f3c59094229b0fa41d5fcdb95b60fc93686d5ec7a5f98c88dc945c9642d0b5dbaeaeba963c31c2463103f6b16c62d013a48225e2723ddda978359 +SHA512 (osc-0.161.1.tar.gz) = 5baf67cc6bc7b9a54da20e3f89a648cea317dd36af47478e42e41e15ada19b01ddb86d7666003f02c0f13a544c49d5d2b89d1d8c98a14d24747db0e6483e5a3e