From f190f295d3b5993145edbc335979f1236d5be9661de19ee996a721d30ea6ca00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Jan 2017 16:03:07 +0000 Subject: [PATCH 1/3] - Build with javac as gcj is getting deprecated and 1.8 java should bootstrap itself OBS-URL: https://build.opensuse.org/package/show/Java:packages/regexp?expand=0&rev=12 --- regexp.changes | 6 ++++++ regexp.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/regexp.changes b/regexp.changes index f3ba5fb..5b1a623 100644 --- a/regexp.changes +++ b/regexp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 5 16:02:34 UTC 2017 - tchvatal@suse.com + +- Build with javac as gcj is getting deprecated and 1.8 java should + bootstrap itself + ------------------------------------------------------------------- Wed Mar 18 09:46:19 UTC 2015 - tchvatal@suse.com diff --git a/regexp.spec b/regexp.spec index 1fe0533..9757ab7 100644 --- a/regexp.spec +++ b/regexp.spec @@ -1,7 +1,7 @@ # # spec file for package regexp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -35,14 +35,13 @@ BuildRequires: javapackages-tools Requires(pre): javapackages-tools Requires(postun): javapackages-tools BuildRequires: ant >= 1.6 -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: xml-commons-apis-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons-jaxp-1.3-apis BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: xml-commons-apis-bootstrap %description From c95bdfa429b4e307918bf20cd92b6a2c393eb9c843a967e2dfdcfafb88aa6e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Feb 2017 15:18:12 +0000 Subject: [PATCH 2/3] Accepting request 456865 from Java:packages OBS-URL: https://build.opensuse.org/request/show/456865 OBS-URL: https://build.opensuse.org/package/show/Java:packages/regexp?expand=0&rev=13 --- regexp.changes | 6 ------ regexp.spec | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/regexp.changes b/regexp.changes index 5b1a623..f3ba5fb 100644 --- a/regexp.changes +++ b/regexp.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 5 16:02:34 UTC 2017 - tchvatal@suse.com - -- Build with javac as gcj is getting deprecated and 1.8 java should - bootstrap itself - ------------------------------------------------------------------- Wed Mar 18 09:46:19 UTC 2015 - tchvatal@suse.com diff --git a/regexp.spec b/regexp.spec index 9757ab7..1fe0533 100644 --- a/regexp.spec +++ b/regexp.spec @@ -1,7 +1,7 @@ # # spec file for package regexp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -35,13 +35,14 @@ BuildRequires: javapackages-tools Requires(pre): javapackages-tools Requires(postun): javapackages-tools BuildRequires: ant >= 1.6 -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: xml-commons-apis-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons-jaxp-1.3-apis BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: xml-commons-apis-bootstrap %description From 55770ae6650fc8efc2a63d9f092bb9270f7cee7765770e321cc871805fab84c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:29:27 +0000 Subject: [PATCH 3/3] Accepting request 496624 from home:DZiolkowski:branches:Java:packages - New build dependency: javapackages-local - spec cleaned using spec-cleaner OBS-URL: https://build.opensuse.org/request/show/496624 OBS-URL: https://build.opensuse.org/package/show/Java:packages/regexp?expand=0&rev=14 --- regexp.changes | 6 ++++++ regexp.spec | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/regexp.changes b/regexp.changes index f3ba5fb..08644d5 100644 --- a/regexp.changes +++ b/regexp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 19 11:22:28 UTC 2017 - dziolkowski@suse.com + +- New build dependency: javapackages-local +- spec cleaned using spec-cleaner + ------------------------------------------------------------------- Wed Mar 18 09:46:19 UTC 2015 - tchvatal@suse.com diff --git a/regexp.spec b/regexp.spec index 1fe0533..6098013 100644 --- a/regexp.spec +++ b/regexp.spec @@ -1,9 +1,8 @@ # # spec file for package regexp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 %define full_name jakarta-%{name} %define section free - Name: regexp Version: 1.5 Release: 0 @@ -31,19 +28,16 @@ Group: Development/Libraries/Java Url: http://jakarta.apache.org/%{name}/ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Source1: regexp-%{version}.pom -BuildRequires: javapackages-tools -Requires(pre): javapackages-tools -Requires(postun): javapackages-tools +BuildRequires: ant BuildRequires: ant >= 1.6 BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: javapackages-local +BuildRequires: javapackages-tools BuildRequires: xml-commons-apis-bootstrap +BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons-jaxp-1.3-apis BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: xml-commons-apis-bootstrap %description Regexp is a 100% Pure Java Regular Expression package that was @@ -66,13 +60,13 @@ ant -Djakarta-site2.dir=. jar %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) [ -d docs/api ] && rm -rf docs/api # pom -%{__mkdir_p} %{buildroot}%{_mavenpomdir} -%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +mkdir -p %{buildroot}%{_mavenpomdir} +install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar %files