From 4b6e235524e6844447dd66acad311c2b2437eb79 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 11 Nov 2010 15:35:10 +0000 Subject: [PATCH] fix build for SLES 9 Rev openSUSE:Tools/105 Md5 8c69613151e22d192ca7590e004ae13b 2010-11-11 15:35:10 adrianSuSE None --- ...recompress:tar_scm:build-2010.11.11.tar.gz | 3 - _service:set_version:build.dsc | 9 -- _service:set_version:build.spec | 127 ------------------ build.spec | 2 +- 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 _service:recompress:tar_scm:build-2010.11.11.tar.gz delete mode 100644 _service:set_version:build.dsc delete mode 100644 _service:set_version:build.spec diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz deleted file mode 100644 index 0d1452a0..00000000 --- a/_service:recompress:tar_scm:build-2010.11.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ca2c05d510c54bbab6e0ef38c04ba37b1d2bc1c380b53c0ccf4487fe880a6c -size 585649 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 036e984c..00000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.11.11 -Binary: build -Maintainer: Adrian Schroeter -Architecture: all -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) - diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec deleted file mode 100644 index 8e75567a..00000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,127 +0,0 @@ -# -# spec file for package build (Version 2010.10.12) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: build -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: A Script to Build SUSE Linux RPMs -Version: 2010.11.11 -Release: 1 -#!BuildIgnore: build-mkbaselibs -Source: build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off -# Keep the following dependencies in sync with obs-worker package -Requires: bash -Requires: perl -Requires: binutils -Requires: tar -# None of them are actually required for core features. -# Perl helper scripts use them. -%if 0%{?suse_version} -Recommends: perl(Date::Language) -Recommends: perl(Date::Parse) -Recommends: perl(LWP::UserAgent) -Recommends: perl(Pod::Usage) -Recommends: perl(Time::Zone) -Recommends: perl(URI) -Recommends: perl(XML::Parser) -%endif - -%description -This package provides a script for building RPMs for SUSE Linux in a -chroot environment. - - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: build-mkbaselibs -Recommends: build-mkdrpms - -%package mkbaselibs -License: GPLv2+ -Group: Development/Tools/Building -Summary: Tools to generate base lib packages -# NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) - -%description mkbaselibs -This package contains the parts which may be installed in the inner build system -for generating base lib packages. - -%package mkdrpms -License: GPLv2+ -Group: Development/Tools/Building -Summary: Tools to generate delta rpms -Requires: deltarpm -# XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq -Requires: build - -%description mkdrpms -This package contains the parts which may be installed in the inner build system -for generating delta rpm packages. - -%endif - -%prep -%setup -q - -%build - -%install -make DESTDIR=$RPM_BUILD_ROOT install -cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf -%else -%if 0%{?suse_version} - V=%suse_version - ln -s sl${V:0:2}.${V:2:1}.conf default.conf -%endif -%endif - -%files -%defattr(-,root,root) -%doc README -/usr/bin/build -/usr/bin/buildvc -/usr/bin/unrpm -/usr/lib/build -%{_mandir}/man1/build.1* - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -%exclude /usr/lib/build/mkbaselibs -%exclude /usr/lib/build/baselibs* -%exclude /usr/lib/build/mkdrpms - -%files mkbaselibs -%defattr(-,root,root) -%dir /usr/lib/build -/usr/lib/build/mkbaselibs -/usr/lib/build/baselibs* - -%files mkdrpms -%defattr(-,root,root) -%dir /usr/lib/build -/usr/lib/build/mkdrpms -%endif - -%changelog diff --git a/build.spec b/build.spec index abb06bd6..a0878947 100644 --- a/build.spec +++ b/build.spec @@ -38,7 +38,7 @@ Requires: binutils Requires: tar # None of them are actually required for core features. # Perl helper scripts use them. -%if 0%{?suse_version} +%if 0%{?suse_version} > 1000 Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent)