From adbbe3eed0a4bc838358e3d0cb59e782d70924e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Oct 2011 14:40:31 +0000 Subject: [PATCH] fix buid for rpm v5 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=153 --- _service | 4 ++-- build-2011.10.10.tar.gz | 3 --- build-initvm.spec | 6 +++--- build-mkbaselibs-sle.spec | 6 +++--- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 6 +++--- obs-build-2011.10.25.tar.gz | 3 +++ 8 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 build-2011.10.10.tar.gz create mode 100644 obs-build-2011.10.25.tar.gz diff --git a/_service b/_service index a52dfd44..091b701c 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2011.10.10 - git://gitorious.org/opensuse/build.git + 2011.10.25 + git://github.com/openSUSE/obs-build.git git diff --git a/build-2011.10.10.tar.gz b/build-2011.10.10.tar.gz deleted file mode 100644 index 5b469983..00000000 --- a/build-2011.10.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31d6d266cbc23fd326e09f1b3884165beb9340c3ec6fa967616d14bde09f27c9 -size 268519 diff --git a/build-initvm.spec b/build-initvm.spec index 5807c8af..20c91ca2 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -22,9 +22,9 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.07.01 +Version: 2011.10.25 Release: 0 -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: off Requires: build @@ -39,7 +39,7 @@ chroot or a secure virtualized environment. %prep -%setup -q -n build-%version +%setup -q -n obs-build-%version %build make CFLAGS="$RPM_BUILD_FLAGS" initvm-all diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 78f26e70..5477e099 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -23,11 +23,11 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.10.10 +Version: 2011.10.25 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -40,7 +40,7 @@ for generating base lib packages. This is the SLE variant including IA64 binary generation. %prep -%setup -q -n build-%{version} +%setup -q -n obs-build-%{version} %build diff --git a/build.changes b/build.changes index c96a2388..8c6c1579 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 25 14:40:05 UTC 2011 - adrian@suse.de + +- use github.com as git repo now +- fix build for rpmv5 + ------------------------------------------------------------------- Mon Oct 10 19:29:20 CEST 2011 - mls@suse.de diff --git a/build.dsc b/build.dsc index 04ba7754..6038364a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.10.10 +Version: 2011.10.25 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 36da82c1..bb00b14e 100644 --- a/build.spec +++ b/build.spec @@ -23,10 +23,10 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.10.10 +Version: 2011.10.25 Release: 0 #!BuildIgnore: build-mkbaselibs -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -90,7 +90,7 @@ for generating delta rpm packages. %endif %prep -%setup -q +%setup -q -n obs-build-%version %build diff --git a/obs-build-2011.10.25.tar.gz b/obs-build-2011.10.25.tar.gz new file mode 100644 index 00000000..bd752b37 --- /dev/null +++ b/obs-build-2011.10.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4b51dbe1e85bdb7aa363886c91417d43c543351880f79e87586a614a0fb9329 +size 125148