* add SLE wrapper to prepare modules for packages dvd (jsc#SLE-8271)
  * smaller perl fixes

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=101
This commit is contained in:
Stephan Kulow 2019-09-16 08:33:58 +00:00 committed by Git OBS Bridge
parent 2fbb5ccbc6
commit 9299ad437d
6 changed files with 26 additions and 12 deletions

View File

@ -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.3</param>
<param name="version">1.2.3</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>

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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>
@ -5,7 +12,6 @@ Fri Sep 13 06:08:31 UTC 2019 - Adrian Schröter <adrian@suse.de>
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>

View File

@ -1,5 +1,5 @@
name: product-builder
version: 1.2.3
mtime: 1568354810
commit: d5ba81f2fd4438d04e3236bcc78564bd51f78e56
version: 1.2.4
mtime: 1568615822
commit: ad6f455bc44b150eb916663ed8cff74fae455c94

View File

@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
Version: 1.2.3
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