From 0eb74855f28d959ba9c301e6c6f44abfbd0388ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jan 19 2015 04:50:55 +0000 Subject: Port to lua 5.3.0 --- diff --git a/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch b/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch index 35b94fe..335c538 100644 --- a/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch +++ b/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch @@ -1,7 +1,7 @@ From 37dec7006368fc85f4cefa31d3e92f7daff3f680 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 7 Jan 2015 00:47:08 +0100 -Subject: [PATCH 1/2] [mvn_artifact] Fix "TypeError: process_raw_request() got +Subject: [PATCH 1/3] [mvn_artifact] Fix "TypeError: process_raw_request() got an unexpected keyword argument 'scl'" --- diff --git a/0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch b/0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch index c987c6a..c535b98 100644 --- a/0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch +++ b/0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch @@ -1,7 +1,7 @@ From 6886cb1f4c0b70d83eb19c706701f83643cfd5ba Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 14 Jan 2015 10:07:49 +0100 -Subject: [PATCH 2/2] Replace all dashes with dots in versioned provides and +Subject: [PATCH 2/3] Replace all dashes with dots in versioned provides and requires e.g.: diff --git a/0003-Add-compatibility-with-lua-5.3.0.patch b/0003-Add-compatibility-with-lua-5.3.0.patch new file mode 100644 index 0000000..b011810 --- /dev/null +++ b/0003-Add-compatibility-with-lua-5.3.0.patch @@ -0,0 +1,37 @@ +From aa56a70c74eae5508972c7d25d43da26fc9b071c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 19 Jan 2015 05:46:46 +0100 +Subject: [PATCH 3/3] Add compatibility with lua 5.3.0 + +--- + depgenerators/fileattrs/maven.attr | 4 ++-- + depgenerators/fileattrs/osgi.attr | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr +index 5bead99..2ed0971 100644 +--- a/depgenerators/fileattrs/maven.attr ++++ b/depgenerators/fileattrs/maven.attr +@@ -1,5 +1,5 @@ + %__maven_provides %{_rpmconfigdir}/maven.prov +-%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} ++%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} + %__maven_requires %{_rpmconfigdir}/maven.req +-%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} ++%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} + %__maven_path ^%{_datadir}/maven-metadata/.* +diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr +index 73a8b00..b33b2e1 100644 +--- a/depgenerators/fileattrs/osgi.attr ++++ b/depgenerators/fileattrs/osgi.attr +@@ -1,5 +1,5 @@ + %__osgi_provides %{_rpmconfigdir}/osgi.prov +-%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} ++%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} + %__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi.req}%{?scl:%{_root_bindir}/true} +-%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} ++%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} + %__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ +-- +2.1.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index d583f1b..0e16cfe 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Macros and scripts for Java packaging support @@ -16,6 +16,7 @@ URL: https://git.fedorahosted.org/git/javapackages.git Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz Patch0: 0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch Patch1: 0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch +Patch2: 0003-Add-compatibility-with-lua-5.3.0.patch BuildArch: noarch @@ -164,6 +165,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %if 0%{?with_python3} @@ -214,6 +216,9 @@ popd %doc LICENSE %changelog +* Mon Jan 19 2015 Mikolaj Izdebski - 4.3.2-3 +- Port to lua 5.3.0 + * Thu Jan 15 2015 Mikolaj Izdebski - 4.3.2-2 - Replace all dashes with dots in versioned provides and requires