CONFLICT Accepting request 71297: update for download_files

Rev openSUSE:Factory/50 Md5 23a654064f2193bd7b3bbfb77e0aca5f 2011-06-06 15:08:41 saschpe 71297

_service

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

build-2011.01.20.tar.gz

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

build-2011.05.24.tar.gz

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

build.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed May 25 12:14:38 UTC 2011 - adrian@suse.de
+
+- allow to use simple spec file parser via Build::show
+
+-------------------------------------------------------------------
+Thu May 12 10:20:53 UTC 2011 - adrian@suse.de
+
+- conflict with old bsdtar (not supporting --chroot)
+
+-------------------------------------------------------------------
+Wed Apr 27 12:34:17 UTC 2011 - adrian@suse.de
+
+- revert to single cpu build default for debian packages
+
+-------------------------------------------------------------------
+Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de
+
+- make sure default.conf is no stale symlink
+
+-------------------------------------------------------------------
+Tue Mar  1 15:35:21 UTC 2011 - adrian@suse.de
+
+- fix xen build support
+
 -------------------------------------------------------------------
 Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 2011.01.20
+Version: 2011.05.24
 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.01.20
+Version: 2011.05.24
-Release:        1
+Release: 0
 #!BuildIgnore:  build-mkbaselibs
 Source:         build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -36,9 +36,10 @@ Requires:       bash
 Requires:       perl
 Requires:       binutils
 Requires:       tar
+Conflicts:      bsdtar < 2.5.5
+%if 0%{?suse_version} > 1000
 # None of them are actually required for core features.
 # Perl helper scripts use them.
-%if 0%{?suse_version} > 1000
 Recommends:     perl(Date::Language)
 Recommends:     perl(Date::Parse)
 Recommends:     perl(LWP::UserAgent)
@@ -90,13 +91,14 @@ for generating delta rpm packages.
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 cd $RPM_BUILD_ROOT/usr/lib/build/configs/
+%if 0%{?suse_version}
 %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
+test -e default.conf
 %endif
 
 %files

debian.tar.gz

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