Accepting request 731197 from openSUSE:Tools
- 1.2.4 * add SLE wrapper to prepare modules for packages dvd (jsc#SLE-8271) * smaller perl fixes - 1.2.3 handle multiple packages with same name but different version/release in one repo. bsc#1150238 OBS-URL: https://build.opensuse.org/request/show/731197 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/product-builder?expand=0&rev=27
This commit is contained in:
commit
2057c02924
4
_service
4
_service
@ -1,8 +1,8 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="url">https://github.com/openSUSE/product-builder.git</param>
|
||||
<param name="revision">1.2.2</param>
|
||||
<param name="version">1.2.2</param>
|
||||
<param name="revision">1.2.4</param>
|
||||
<param name="version">1.2.4</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="extract">rpm/product-builder.spec</param>
|
||||
</service>
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf757d6ad500ab79f04d3e02502b3574d4722e9a1c536122a1631349c0d3a626
|
||||
size 1312268
|
3
product-builder-1.2.4.obscpio
Normal file
3
product-builder-1.2.4.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb7a599feb605084768a4575db9f33e544dfd1e4a82c2ef1c32c165dc4306121
|
||||
size 1316364
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 16 08:32:26 UTC 2019 - Stephan Kulow <coolo@suse.com>
|
||||
|
||||
- 1.2.4
|
||||
* add SLE wrapper to prepare modules for packages dvd (jsc#SLE-8271)
|
||||
* smaller perl fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 13 06:08:31 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||
|
||||
- 1.2.3
|
||||
handle multiple packages with same name but different version/release in one repo.
|
||||
bsc#1150238
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 07:38:10 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
name: product-builder
|
||||
version: 1.2.2
|
||||
mtime: 1563275740
|
||||
commit: fa39a2b5a3f8bd27117afa9bca71b8512c1a77ca
|
||||
version: 1.2.4
|
||||
mtime: 1568615822
|
||||
commit: ad6f455bc44b150eb916663ed8cff74fae455c94
|
||||
|
||||
|
@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder
|
||||
Name: product-builder
|
||||
Conflicts: kiwi
|
||||
Conflicts: kiwi-instsource
|
||||
Version: 1.2.2
|
||||
Version: 1.2.4
|
||||
Release: 0
|
||||
Provides: kiwi-schema = 6.2
|
||||
Source: product-builder-%version.tar.xz
|
||||
@ -62,7 +62,7 @@ To be used only for product medias for Leap 15 and SLE 15.
|
||||
|
||||
%build
|
||||
test -e /.buildenv && . /.buildenv
|
||||
make buildroot="%{buildroot}" CFLAGS="%{optflags}"
|
||||
make CFLAGS="%{optflags}"
|
||||
|
||||
%install
|
||||
make buildroot="%{buildroot}" \
|
||||
@ -71,6 +71,14 @@ make buildroot="%{buildroot}" \
|
||||
install
|
||||
./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
mv %{buildroot}%{_bindir}/product-builder{.pl,}
|
||||
%else
|
||||
# install SLE wrapper as entry point. It doesn't really harm as the
|
||||
# build flavor detected is very specific, but to avoid waste...
|
||||
ln -s product-builder-sle.sh %{buildroot}%{_bindir}/product-builder
|
||||
%endif
|
||||
|
||||
%files
|
||||
%dir %{_datadir}/kiwi
|
||||
%license LICENSE
|
||||
@ -78,6 +86,6 @@ make buildroot="%{buildroot}" \
|
||||
%{_datadir}/kiwi/metadata
|
||||
%{_datadir}/kiwi/modules
|
||||
%{_datadir}/kiwi/xsl
|
||||
%{_bindir}/product-builder
|
||||
%{_bindir}/product-builder*
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user