Accepting request 135865: - remove build-mkbaselibs-sle, the split is no longer necessary

- remove default requires for devel-32bit

- fix logic for cumulating packages

Rev openSUSE:Factory/69 Md5 d043b85366093ddd01a05c4126a40cf2 2012-09-26 14:09:16 coolo 135865
This commit is contained in:
OBS User coolo 2012-09-26 14:09:16 +00:00 committed by Git OBS Bridge
commit 02223cc199
9 changed files with 18 additions and 81 deletions

View File

@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="version">2012.09.24</param>
<param name="version">2012.09.25</param>
<param name="url">git://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
</service>

View File

@ -20,7 +20,7 @@ Name: build-initvm
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+
Group: Development/Tools/Building
Version: 2012.09.24
Version: 2012.09.25
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build

View File

@ -1,15 +0,0 @@
-------------------------------------------------------------------
Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de
- provide build-mkbaselibs so this can really be used
-------------------------------------------------------------------
Tue Jun 7 09:31:51 UTC 2011 - k0da@opensuse.org
- fix build
-------------------------------------------------------------------
Mon Jun 6 15:12:13 UTC 2011 - adrian@suse.de
- new package for SLE baselibsconf, including ia64 arch defaults

View File

@ -1,59 +0,0 @@
#
# spec file for package build-mkbaselibs-sle
#
# Copyright (c) 2012 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/
#
Name: build-mkbaselibs-sle
Summary: Tools to generate base lib packages
License: GPL-2.0+
Group: Development/Tools/Building
Version: 2012.09.24
Release: 0
#!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
# Manual requires to avoid hard require to bash-static
AutoReqProv: off
%description
This package contains the parts which may be installed in the inner build system
for generating base lib packages.
This is the SLE variant including IA64 binary generation.
%prep
%setup -q -n obs-build-%{version}
%build
%install
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build
install -m 0755 mkbaselibs \
$RPM_BUILD_ROOT/usr/lib/build/mkbaselibs
install -m 0644 baselibs_global-deb.conf \
$RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf
install -m 0644 baselibs_global-sle.conf \
$RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf
%files
%defattr(-,root,root)
%dir /usr/lib/build
/usr/lib/build/mkbaselibs
/usr/lib/build/baselibs*
%changelog

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Sep 25 11:25:49 UTC 2012 - coolo@suse.com
- remove build-mkbaselibs-sle, the split is no longer necessary
- remove default requires for devel-32bit
-------------------------------------------------------------------
Tue Sep 25 08:30:55 UTC 2012 - coolo@suse.com
- fix logic for cumulating packages
-------------------------------------------------------------------
Mon Sep 24 15:47:27 UTC 2012 - coolo@suse.com

View File

@ -1,6 +1,6 @@
Format: 1.0
Source: build
Version: 2012.09.24
Version: 2012.09.25
Binary: build
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all

View File

@ -20,7 +20,7 @@ Name: build
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
Version: 2012.09.24
Version: 2012.09.25
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: obs-build-%{version}.tar.gz

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03cadd808a9ae61a1b3c580b28bf7c837ae6e46f064c6451020326370c062c07
size 155485

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:500d60a0266b5a50358cc6072b827ca2be4d6062ba746c41ffeb0f9b98a954e2
size 148557