pool/build
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CONFLICT Accepting request 55726: Accepted submit request 55726 from user coolo

Browse Source 
Rev openSUSE:Factory/45 Md5 b90fa7d1ceb0b8f6fa9e0009a503fad1 2010-12-13 13:18:08 azouhr 55726
This commit is contained in:
OBS User azouhr 2010-12-13 13:18:08 +00:00 committed by Git OBS Bridge
commit f9fcef85ac
7 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -1,5 +1,5 @@
<services> <services>
<service name="tar_scm"><param name="version">2010.11.02</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service> <service name="tar_scm"><param name="version">2010.12.09</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service>
<service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service> <service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service>
<service name="set_version"/> <service name="set_version"/>
</services> </services>

3
_service:recompress:tar_scm:build-2010.11.02.tar.gz
View File

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

3
_service:recompress:tar_scm:build-2010.12.09.tar.gz Normal file
View File

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

2
_service:set_version:build.dsc
View File

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

7
_service:set_version:build.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package build (Version 2010.10.12) # spec file for package build (Version 2010.11.02)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -23,7 +23,7 @@ License: GPLv2+
Group: Development/Tools/Building Group: Development/Tools/Building
AutoReqProv: on AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs Summary: A Script to Build SUSE Linux RPMs
Version: 2010.11.02 Version: 2010.12.09
Release: 1 Release: 1
#!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz Source: build-%{version}.tar.gz
@ -38,7 +38,7 @@ Requires: binutils
Requires: tar Requires: tar
# None of them are actually required for core features. # None of them are actually required for core features.
# Perl helper scripts use them. # Perl helper scripts use them.
%if 0%{?suse_version} %if 0%{?suse_version} > 1000
Recommends: perl(Date::Language) Recommends: perl(Date::Language)
Recommends: perl(Date::Parse) Recommends: perl(Date::Parse)
Recommends: perl(LWP::UserAgent) Recommends: perl(LWP::UserAgent)
@ -46,6 +46,7 @@ Recommends: perl(Pod::Usage)
Recommends: perl(Time::Zone) Recommends: perl(Time::Zone)
Recommends: perl(URI) Recommends: perl(URI)
Recommends: perl(XML::Parser) Recommends: perl(XML::Parser)
Recommends: bsdtar
%endif %endif
%description %description

13
build.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Dec 9 11:51:40 UTC 2010 - adrian@suse.de
- support bsdtar for setting up build enviroment
- make expanddeps use the highest version of a package if multiple
versions aver available in a repository [bnc#656599]
- support other file formats (esp. for .ZIP and .EXE export for crossbuild)
-------------------------------------------------------------------
Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de
- workaround for distros with appstart like Ubuntu 10.10
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 2 16:32:42 UTC 2010 - lnussel@suse.de Tue Nov 2 16:32:42 UTC 2010 - lnussel@suse.de

7
build.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package build (Version 2010.10.12) # spec file for package build (Version 2010.11.02)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -23,7 +23,7 @@ License: GPLv2+
Group: Development/Tools/Building Group: Development/Tools/Building
AutoReqProv: on AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs Summary: A Script to Build SUSE Linux RPMs
Version: 2010.11.02 Version: 2010.12.09
Release: 1 Release: 1
#!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz Source: build-%{version}.tar.gz
@ -38,7 +38,7 @@ Requires: binutils
Requires: tar Requires: tar
# None of them are actually required for core features. # None of them are actually required for core features.
# Perl helper scripts use them. # Perl helper scripts use them.
%if 0%{?suse_version} %if 0%{?suse_version} > 1000
Recommends: perl(Date::Language) Recommends: perl(Date::Language)
Recommends: perl(Date::Parse) Recommends: perl(Date::Parse)
Recommends: perl(LWP::UserAgent) Recommends: perl(LWP::UserAgent)
@ -46,6 +46,7 @@ Recommends: perl(Pod::Usage)
Recommends: perl(Time::Zone) Recommends: perl(Time::Zone)
Recommends: perl(URI) Recommends: perl(URI)
Recommends: perl(XML::Parser) Recommends: perl(XML::Parser)
Recommends: bsdtar
%endif %endif
%description %description