Mercurial > hg > release > icedtea-web-1.6
changeset 1295:f6e5aaaba724
maven artifacts version substituted to contains only major version
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 02 Feb 2016 17:49:18 +0100 |
| parents | 5be0492c4e4b |
| children | d518c093bd44 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 28 13:40:08 2016 +0100 +++ b/ChangeLog Tue Feb 02 17:49:18 2016 +0100 @@ -1,3 +1,9 @@ +2016-02-02 Jiri Vanek <jvanek@redhat.com> + + maven artifacts version substituted to contains only major version + * .Makefile: ($(abs_top_builddir)/metadata) version stripped by everything + behind second number + 2016-01-28 Matthias Klose <doko@ubuntu.com> Jiri Vanek <jvanek@redhat.com>
--- a/Makefile.am Thu Jan 28 13:40:08 2016 +0100 +++ b/Makefile.am Tue Feb 02 17:49:18 2016 +0100 @@ -508,11 +508,22 @@ sed -i '/RhinoBasedPacEvaluator/ d' $@ endif +# if 'sed' will be missing on machine, use old IFS hack as on other places +# the 'sed' cycles is changing some custom version like 1.6.2 fedora23.4 to simple 1.6 +# if changed, keep in mind that also 1.7 should bubble to 1.7 +# also 1.7pre or 1.7preHASH should end up like 1.7 $(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in mkdir -p $(abs_top_builddir)/metadata-work ; \ METAFILES=`ls $(top_srcdir)/metadata.in` ; \ + SEDDED_VERSION=`echo "$(FULL_VERSION)" | sed 's/[^0-9]\+/ /g'` ; \ + x=0; for i in $$SEDDED_VERSION ; do \ + let x++; \ + if [ $$x -eq 1 ] ; then V1=$$i; fi; \ + if [ $$x -eq 2 ] ; then V2=$$i; fi; \ + done; \ + XVERSION=$$V1.$$V2; \ for F in $$METAFILES ; do \ - cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \ + cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$$XVERSION;g" > $(abs_top_builddir)/metadata-work/$$F ; \ done ; \ mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ;