Hello community,
here is the log from the commit of package java-cup for openSUSE:Factory
checked in at 2017-09-18 19:51:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-cup (Old)
and /work/SRC/openSUSE:Factory/.java-cup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-cup"
Mon Sep 18 19:51:02 2017 rev:18 rq:526360 version:0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-cup/java-cup-bootstrap.changes
2013-09-03 22:02:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.java-cup.new/java-cup-bootstrap.changes
2017-09-18 19:51:03.679841901 +0200
@@ -1,0 +2,6 @@
+Fri Sep 15 11:16:58 UTC 2017 - fst...@suse.com
+
+- Do not depend on java-gcj-compat
+- Fix build with jdk9: specify source and target 1.6
+
+-------------------------------------------------------------------
java-cup.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-cup-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.2F2xIJ/_old 2017-09-18 19:51:04.475729960 +0200
+++ /var/tmp/diff_new_pack.2F2xIJ/_new 2017-09-18 19:51:04.479729398 +0200
@@ -1,7 +1,7 @@
#
# spec file for package java-cup-bootstrap
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,10 +18,9 @@
##### WARNING: please do not edit this auto generated spec file. Use the
java-cup.spec! #####
%global with_bootstrap 1
-%bcond_with bootstrap
%define cvs_version 11a
%define real_name java-cup
-
+%bcond_with bootstrap
Name: java-cup-bootstrap
Version: 0.11
Release: 0
@@ -41,11 +40,7 @@
# Missing symbolFactory initialization in lr_parser, causes sinjdoc to crash
Patch4: java-cup-lr_parser-constructor.patch
BuildRequires: ant
-%if %without bootstrap
-BuildRequires: java-cup-bootstrap
-BuildRequires: jflex
-%endif
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
#!BuildIgnore: xml-commons-jaxp-1.3-apis
@@ -53,8 +48,10 @@
Obsoletes: java_cup < %{version}-%{release}
Provides: java_cup = %{version}-%{release}
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+%if %without bootstrap
+BuildRequires: java-cup-bootstrap
+BuildRequires: jflex
+%endif
# bootstrap variant is just stripped down java-cup, so it conflicts
%if %without bootstrap
Conflicts: java-cup-bootstrap
@@ -74,10 +71,7 @@
* have Your own symbol classes
-
-
%if %without bootstrap
-
%package manual
Summary: LALR Parser Generator in Java
Group: Development/Libraries/Java
@@ -96,8 +90,6 @@
* have Your own symbol classes
-
-
%endif
%prep
@@ -107,12 +99,12 @@
%setup -q -T -D -a 2 -n develop
%patch2 -p1
%else
-%{_bindir}/find . -name '*.jar' | %{_bindir}/xargs %{__rm}
+%{_bindir}/find . -name '*.jar' | %{_bindir}/xargs rm
%patch3 -p1
%endif
%patch4 -p1
-%{__perl} -pi -e 's/1\.2/1.5/g' build.xml
-%{__mkdir_p} classes dist
+perl -pi -e 's/1\.2/1.6/g' build.xml
+mkdir -p classes dist
cp %{SOURCE3} license.txt
%build
@@ -122,31 +114,25 @@
export CLASSPATH=$(build-classpath java-cup jflex)
%endif
export OPT_JAR_LIST=:
-%ant
+ant
%install
# jar
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a dist/%{real_name}-%{cvs_version}.jar
%{buildroot}%{_javadir}/%{real_name}-%{version}.jar
-%{__cp} -a dist/%{real_name}-%{cvs_version}-runtime.jar
%{buildroot}%{_javadir}/%{real_name}-runtime-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar}
${jar/-%{version}/}; done)
+mkdir -p %{buildroot}%{_javadir}
+cp -a dist/%{real_name}-%{cvs_version}.jar
%{buildroot}%{_javadir}/%{real_name}-%{version}.jar
+cp -a dist/%{real_name}-%{cvs_version}-runtime.jar
%{buildroot}%{_javadir}/%{real_name}-runtime-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar}
${jar/-%{version}/}; done)
# compatibility symlinks
-(cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar &&
%{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar)
-%{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
-
-%clean
-%{__rm} -rf %{buildroot}
+(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s
%{real_name}-runtime.jar java_cup-runtime.jar)
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
%files
-%defattr(0644,root,root,0755)
%doc changelog.txt license.txt
%attr(0755,root,root) %{_bindir}/%{real_name}
%{_javadir}/*
%if %without bootstrap
-
%files manual
-%defattr(0644,root,root,0755)
%doc manual.html
%endif
++++++ java-cup.spec ++++++
--- /var/tmp/diff_new_pack.2F2xIJ/_old 2017-09-18 19:51:04.531722085 +0200
+++ /var/tmp/diff_new_pack.2F2xIJ/_new 2017-09-18 19:51:04.543720397 +0200
@@ -1,7 +1,7 @@
#
# spec file for package java-cup
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,9 @@
%global _without_bootstrap 1
-%bcond_with bootstrap
%define cvs_version 11a
%define real_name java-cup
-
+%bcond_with bootstrap
Name: java-cup
Version: 0.11
Release: 0
@@ -40,11 +39,7 @@
# Missing symbolFactory initialization in lr_parser, causes sinjdoc to crash
Patch4: java-cup-lr_parser-constructor.patch
BuildRequires: ant
-%if %without bootstrap
-BuildRequires: java-cup-bootstrap
-BuildRequires: jflex
-%endif
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
#!BuildIgnore: xml-commons-jaxp-1.3-apis
@@ -52,8 +47,10 @@
Obsoletes: java_cup < %{version}-%{release}
Provides: java_cup = %{version}-%{release}
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+%if %without bootstrap
+BuildRequires: java-cup-bootstrap
+BuildRequires: jflex
+%endif
# bootstrap variant is just stripped down java-cup, so it conflicts
%if %without bootstrap
Conflicts: java-cup-bootstrap
@@ -73,10 +70,7 @@
* have Your own symbol classes
-
-
%if %without bootstrap
-
%package manual
Summary: LALR Parser Generator in Java
Group: Development/Libraries/Java
@@ -95,8 +89,6 @@
* have Your own symbol classes
-
-
%endif
%prep
@@ -106,12 +98,12 @@
%setup -q -T -D -a 2 -n develop
%patch2 -p1
%else
-%{_bindir}/find . -name '*.jar' | %{_bindir}/xargs %{__rm}
+%{_bindir}/find . -name '*.jar' | %{_bindir}/xargs rm
%patch3 -p1
%endif
%patch4 -p1
-%{__perl} -pi -e 's/1\.2/1.5/g' build.xml
-%{__mkdir_p} classes dist
+perl -pi -e 's/1\.2/1.6/g' build.xml
+mkdir -p classes dist
cp %{SOURCE3} license.txt
%build
@@ -121,31 +113,25 @@
export CLASSPATH=$(build-classpath java-cup jflex)
%endif
export OPT_JAR_LIST=:
-%ant
+ant
%install
# jar
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a dist/%{real_name}-%{cvs_version}.jar
%{buildroot}%{_javadir}/%{real_name}-%{version}.jar
-%{__cp} -a dist/%{real_name}-%{cvs_version}-runtime.jar
%{buildroot}%{_javadir}/%{real_name}-runtime-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar}
${jar/-%{version}/}; done)
+mkdir -p %{buildroot}%{_javadir}
+cp -a dist/%{real_name}-%{cvs_version}.jar
%{buildroot}%{_javadir}/%{real_name}-%{version}.jar
+cp -a dist/%{real_name}-%{cvs_version}-runtime.jar
%{buildroot}%{_javadir}/%{real_name}-runtime-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar}
${jar/-%{version}/}; done)
# compatibility symlinks
-(cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar &&
%{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar)
-%{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
-
-%clean
-%{__rm} -rf %{buildroot}
+(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s
%{real_name}-runtime.jar java_cup-runtime.jar)
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
%files
-%defattr(0644,root,root,0755)
%doc changelog.txt license.txt
%attr(0755,root,root) %{_bindir}/%{real_name}
%{_javadir}/*
%if %without bootstrap
-
%files manual
-%defattr(0644,root,root,0755)
%doc manual.html
%endif
