CONFLICT Accepting request 73992: update

Rev openSUSE:Factory/52 Md5 ace097bd6abd0c1ba5a6f44a3ab960a4 2011-06-24 08:45:45 saschpe 73992

_service

@@ -1,6 +1,6 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">2011.05.24</param>
+    <param name="version">2011.06.17</param>
     <param name="url">git://gitorious.org/opensuse/build.git</param>
     <param name="scm">git</param>
   </service>

build-2011.05.24.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:036b3b2158065127c2942267f370b3b440503efb3724bc0a653a03e4d85b83e6
-size 267240

build-2011.06.17.tar.gz

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

build-mkbaselibs-sle.changes

@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+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
+

build-mkbaselibs-sle.spec

@@ -0,0 +1,67 @@
+#
+# spec file for package build-mkbaselibs-sle
+#
+# Copyright (c) 2011 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-mkbaselibs-sle
+License:        GPLv2+
+Group:          Development/Tools/Building
+AutoReqProv:    on
+Summary:        Tools to generate base lib packages
+Version:        2011.06.17
+Release:        0
+#!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
+
+
+%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 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

build.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 17 08:35:15 UTC 2011 - adrian@suse.de
+
+- support new kiwi command line mode
+
+-------------------------------------------------------------------
+Mon Jun  6 14:57:47 UTC 2011 - adrian@suse.de
+
+- do not build ia64 baselibs packages for openSUSE anymore
+
 -------------------------------------------------------------------
 Wed May 25 12:14:38 UTC 2011 - adrian@suse.de
 

build.dsc

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

build.spec

@@ -23,8 +23,8 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        A Script to Build SUSE Linux RPMs
-Version:        2011.05.24
+Version:        2011.06.17
-Release:        1
+Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Source:         build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -50,6 +50,7 @@ Recommends:     perl(XML::Parser)
 Recommends:     bsdtar
 %endif
 
+
 %description
 This package provides a script for building RPMs for SUSE Linux in a
 chroot environment.
@@ -59,12 +60,14 @@ chroot environment.
 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.
@@ -77,17 +80,21 @@ 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/
@@ -101,6 +108,7 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/
 test -e default.conf
 %endif
 
+
 %files
 %defattr(-,root,root)
 %doc README
@@ -115,16 +123,20 @@ test -e default.conf
 %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