From 7a4a7b8b229c3ed2d6ffdf2d0c64e91bda03ced7717e5f3abbb1dd5b9177b03e Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 14 Nov 2013 16:45:58 +0000 Subject: [PATCH] Accepting request 206925 from home:yan_gao:branches:network:ha-clustering:Factory Use the source service OBS-URL: https://build.opensuse.org/request/show/206925 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=77 --- ...ess:tar_scm:pacemaker-1.1.10+git20131111.e5e37b5.tar.bz2 | 4 ++-- _service:set_version:pacemaker.spec | 4 ++-- pacemaker.spec | 6 +++--- pacemaker.tar.bz2 | 3 --- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 pacemaker.tar.bz2 diff --git a/_service:recompress:tar_scm:pacemaker-1.1.10+git20131111.e5e37b5.tar.bz2 b/_service:recompress:tar_scm:pacemaker-1.1.10+git20131111.e5e37b5.tar.bz2 index 235fda5..7efde32 100644 --- a/_service:recompress:tar_scm:pacemaker-1.1.10+git20131111.e5e37b5.tar.bz2 +++ b/_service:recompress:tar_scm:pacemaker-1.1.10+git20131111.e5e37b5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:284710183526f6bdc35aee230883b050880f3c7117ebe762f03bd8db36fca3c2 -size 9192261 +oid sha256:18fb54b236dc640553fa298407e0596830069e97959b0ef0b43b278868ebcaa1 +size 9191809 diff --git a/_service:set_version:pacemaker.spec b/_service:set_version:pacemaker.spec index ccb7b68..77e8b9e 100644 --- a/_service:set_version:pacemaker.spec +++ b/_service:set_version:pacemaker.spec @@ -102,7 +102,7 @@ Url: http://www.clusterlabs.org # export VER={upstream_version} # wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER} -Source0: %{name}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch Patch2: bug-728579_pacemaker-stonith-dev-id.patch @@ -389,7 +389,7 @@ manager for Corosync, CMAN and/or Linux-HA. %prep #%setup -q -n %{name}%{upstream_prefix}-%{upstream_version} -%setup -q -n %{name} +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/pacemaker.spec b/pacemaker.spec index 9adee7e..77e8b9e 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -95,14 +95,14 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.10 +Version: 1.1.10+git20131111.e5e37b5 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org # export VER={upstream_version} # wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER} -Source0: %{name}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch Patch2: bug-728579_pacemaker-stonith-dev-id.patch @@ -389,7 +389,7 @@ manager for Corosync, CMAN and/or Linux-HA. %prep #%setup -q -n %{name}%{upstream_prefix}-%{upstream_version} -%setup -q -n %{name} +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/pacemaker.tar.bz2 b/pacemaker.tar.bz2 deleted file mode 100644 index 06168e4..0000000 --- a/pacemaker.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1fd4a243749d28098f29d357f075c316651f4564fc14b5fcc077b28287a7b12 -size 8822832