rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to lua 5.3.0

Browse Source
This commit is contained in:
Mikolaj Izdebski 2015-01-19 05:50:55 +01:00
parent 7cf7997344
commit 0eb74855f2
4 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
View File

@ -1,7 +1,7 @@
From 37dec7006368fc85f4cefa31d3e92f7daff3f680 Mon Sep 17 00:00:00 2001 From 37dec7006368fc85f4cefa31d3e92f7daff3f680 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com> From: Michal Srb <msrb@redhat.com>
Date: Wed, 7 Jan 2015 00:47:08 +0100 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'" an unexpected keyword argument 'scl'"
--- ---

2
0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch
View File

@ -1,7 +1,7 @@
From 6886cb1f4c0b70d83eb19c706701f83643cfd5ba Mon Sep 17 00:00:00 2001 From 6886cb1f4c0b70d83eb19c706701f83643cfd5ba Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com> From: Michal Srb <msrb@redhat.com>
Date: Wed, 14 Jan 2015 10:07:49 +0100 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 requires
e.g.: e.g.:

37
0003-Add-compatibility-with-lua-5.3.0.patch Normal file
View File

@ -0,0 +1,37 @@
From aa56a70c74eae5508972c7d25d43da26fc9b071c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

7
javapackages-tools.spec
View File

@ -7,7 +7,7 @@
Name: javapackages-tools Name: javapackages-tools
Version: 4.3.2 Version: 4.3.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Macros and scripts for Java packaging support 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 Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
Patch0: 0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch Patch0: 0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
Patch1: 0002-Replace-all-dashes-with-dots-in-versioned-provides-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 BuildArch: noarch
@ -164,6 +165,7 @@ This package provides non-essential macros and scripts to support Java packaging
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
%if 0%{?with_python3} %if 0%{?with_python3}
@ -214,6 +216,9 @@ popd
%doc LICENSE %doc LICENSE
%changelog %changelog
* Mon Jan 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-3
- Port to lua 5.3.0
* Thu Jan 15 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-2 * Thu Jan 15 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.2-2
- Replace all dashes with dots in versioned provides and requires - Replace all dashes with dots in versioned provides and requires