commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2024-02-23 16:40:33
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new.1770 (New)
Package is "jflex"
Fri Feb 23 16:40:33 2024 rev:26 rq:1148910 version:1.8.2
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2023-10-27
22:27:12.505347415 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new.1770/jflex-bootstrap.changes
2024-02-23 16:40:36.201057982 +0100
@@ -1,0 +2,5 @@
+Wed Feb 21 22:06:45 UTC 2024 - Fridrich Strba
+
+- Use %patch -P N instead of deprecated %patchN.
+
+---
jflex.changes: same change
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.vWNkVs/_old 2024-02-23 16:40:37.513105543 +0100
+++ /var/tmp/diff_new_pack.vWNkVs/_new 2024-02-23 16:40:37.525105979 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jflex-bootstrap
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -98,7 +98,7 @@
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
mkdir -p lib
-%patch0 -p1
+%patch -P 0 -p1
build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%else
%{mvn_file} : %{name} JFlex
++ jflex.spec ++
--- /var/tmp/diff_new_pack.vWNkVs/_old 2024-02-23 16:40:37.841117434 +0100
+++ /var/tmp/diff_new_pack.vWNkVs/_new 2024-02-23 16:40:37.857118014 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jflex
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -97,7 +97,7 @@
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
mkdir -p lib
-%patch0 -p1
+%patch -P 0 -p1
build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%else
%{mvn_file} : %{name} JFlex
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2023-10-27 22:27:08
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new.17445 (New)
Package is "jflex"
Fri Oct 27 22:27:08 2023 rev:25 rq:1120363 version:1.8.2
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2023-05-06
22:08:26.716467420 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new.17445/jflex-bootstrap.changes
2023-10-27 22:27:12.505347415 +0200
@@ -1,0 +2,5 @@
+Wed Oct 25 18:27:04 UTC 2023 - Fridrich Strba
+
+- Build with source and target levels 8
+
+---
jflex.changes: same change
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.cdmHp5/_old 2023-10-27 22:27:13.753393189 +0200
+++ /var/tmp/diff_new_pack.cdmHp5/_new 2023-10-27 22:27:13.753393189 +0200
@@ -92,6 +92,8 @@
%pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml
%pom_xpath_remove "pom:plugin[pom:artifactId='jacoco-maven-plugin']" parent.xml
+%pom_xpath_set pom:project/pom:properties/pom:jflex.jdk.version 1.8 parent.xml
+
%if %{with bootstrap}
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
++ jflex.spec ++
--- /var/tmp/diff_new_pack.cdmHp5/_old 2023-10-27 22:27:13.777394069 +0200
+++ /var/tmp/diff_new_pack.cdmHp5/_new 2023-10-27 22:27:13.781394215 +0200
@@ -91,6 +91,8 @@
%pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml
%pom_xpath_remove "pom:plugin[pom:artifactId='jacoco-maven-plugin']" parent.xml
+%pom_xpath_set pom:project/pom:properties/pom:jflex.jdk.version 1.8 parent.xml
+
%if %{with bootstrap}
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jflex for openSUSE:Factory checked in at 2023-05-06 22:08:24 Comparing /work/SRC/openSUSE:Factory/jflex (Old) and /work/SRC/openSUSE:Factory/.jflex.new.1533 (New) Package is "jflex" Sat May 6 22:08:24 2023 rev:24 rq:1084834 version:1.8.2 Changes: --- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2022-05-24 20:33:33.203036482 +0200 +++ /work/SRC/openSUSE:Factory/.jflex.new.1533/jflex-bootstrap.changes 2023-05-06 22:08:26.716467420 +0200 @@ -1,0 +2,7 @@ +Thu May 4 13:37:10 UTC 2023 - Frederic Crozat + +- Add _multibuild to define additional spec files as additional + flavors. + Eliminates the need for source package links in OBS. + +--- jflex.changes: same change New: _multibuild Other differences: -- ++ jflex-bootstrap.spec ++ --- /var/tmp/diff_new_pack.3VzQmp/_old 2023-05-06 22:08:27.316470761 +0200 +++ /var/tmp/diff_new_pack.3VzQmp/_new 2023-05-06 22:08:27.320470783 +0200 @@ -1,7 +1,7 @@ # # spec file for package jflex-bootstrap # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed jflex.spec: same change ++ _multibuild ++ jflex-bootstrap
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jflex for openSUSE:Factory checked in at 2022-05-24 20:33:32 Comparing /work/SRC/openSUSE:Factory/jflex (Old) and /work/SRC/openSUSE:Factory/.jflex.new.2254 (New) Package is "jflex" Tue May 24 20:33:32 2022 rev:23 rq:978766 version:1.8.2 Changes: --- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2022-04-02 18:20:03.454600386 +0200 +++ /work/SRC/openSUSE:Factory/.jflex.new.2254/jflex-bootstrap.changes 2022-05-24 20:33:33.203036482 +0200 @@ -4 +4 @@ -- Build against the standalone JavaEE modules inconditionally +- Build against the standalone JavaEE modules unconditionally jflex.changes: same change Other differences: -- jflex.spec: same change
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2022-04-02 18:19:59
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new.1900 (New)
Package is "jflex"
Sat Apr 2 18:19:59 2022 rev:22 rq:965941 version:1.8.2
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2022-03-28
16:59:26.648878325 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new.1900/jflex-bootstrap.changes
2022-04-02 18:20:03.454600386 +0200
@@ -1,0 +2,5 @@
+Wed Mar 30 10:16:51 UTC 2022 - Fridrich Strba
+
+- Build against the standalone JavaEE modules inconditionally
+
+---
jflex.changes: same change
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.cLXefm/_old 2022-04-02 18:20:04.730586063 +0200
+++ /var/tmp/diff_new_pack.cLXefm/_new 2022-04-02 18:20:04.738585973 +0200
@@ -31,9 +31,7 @@
Source2:jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant
-%if 0%{?suse_version} > 1500
BuildRequires: glassfish-annotation-api
-%endif
BuildRequires: java-devel
BuildRequires: javapackages-local
Requires: java_cup
@@ -99,10 +97,7 @@
cp %{SOURCE2} build.xml
mkdir -p lib
%patch0 -p1
-build-jar-repository -s lib java-cup-runtime
-%if 0%{?suse_version} > 1500
-build-jar-repository -s lib glassfish-annotation-api
-%endif
+build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%else
%{mvn_file} : %{name} JFlex
%endif
++ jflex.spec ++
--- /var/tmp/diff_new_pack.cLXefm/_old 2022-04-02 18:20:04.762585705 +0200
+++ /var/tmp/diff_new_pack.cLXefm/_new 2022-04-02 18:20:04.766585659 +0200
@@ -30,9 +30,7 @@
Source2:jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant
-%if 0%{?suse_version} > 1500
BuildRequires: glassfish-annotation-api
-%endif
BuildRequires: java-devel
BuildRequires: javapackages-local
Requires: java_cup
@@ -98,10 +96,7 @@
cp %{SOURCE2} build.xml
mkdir -p lib
%patch0 -p1
-build-jar-repository -s lib java-cup-runtime
-%if 0%{?suse_version} > 1500
-build-jar-repository -s lib glassfish-annotation-api
-%endif
+build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%else
%{mvn_file} : %{name} JFlex
%endif
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2022-03-28 16:58:55
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new.1900 (New)
Package is "jflex"
Mon Mar 28 16:58:55 2022 rev:21 rq:962502 version:1.8.2
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2022-01-15
21:45:12.345614278 +0100
+++ /work/SRC/openSUSE:Factory/.jflex.new.1900/jflex-bootstrap.changes
2022-03-28 16:59:26.648878325 +0200
@@ -1,0 +2,7 @@
+Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba
+
+- Build against standalone glassfish-annotation-api for relevant
+ distribution versions that have JDK that does not contain the
+ JavaEE modules
+
+---
jflex.changes: same change
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.bM8h2P/_old 2022-03-28 16:59:27.896880019 +0200
+++ /var/tmp/diff_new_pack.bM8h2P/_new 2022-03-28 16:59:27.904880030 +0200
@@ -31,6 +31,9 @@
Source2:jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant
+%if 0%{?suse_version} > 1500
+BuildRequires: glassfish-annotation-api
+%endif
BuildRequires: java-devel
BuildRequires: javapackages-local
Requires: java_cup
@@ -94,9 +97,12 @@
%if %{with bootstrap}
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
-%patch0 -p1
mkdir -p lib
+%patch0 -p1
build-jar-repository -s lib java-cup-runtime
+%if 0%{?suse_version} > 1500
+build-jar-repository -s lib glassfish-annotation-api
+%endif
%else
%{mvn_file} : %{name} JFlex
%endif
++ jflex.spec ++
--- /var/tmp/diff_new_pack.bM8h2P/_old 2022-03-28 16:59:27.936880074 +0200
+++ /var/tmp/diff_new_pack.bM8h2P/_new 2022-03-28 16:59:27.940880080 +0200
@@ -30,6 +30,9 @@
Source2:jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant
+%if 0%{?suse_version} > 1500
+BuildRequires: glassfish-annotation-api
+%endif
BuildRequires: java-devel
BuildRequires: javapackages-local
Requires: java_cup
@@ -93,9 +96,12 @@
%if %{with bootstrap}
%setup -q -T -D -a 1 -n jflex-%{version}
cp %{SOURCE2} build.xml
-%patch0 -p1
mkdir -p lib
+%patch0 -p1
build-jar-repository -s lib java-cup-runtime
+%if 0%{?suse_version} > 1500
+build-jar-repository -s lib glassfish-annotation-api
+%endif
%else
%{mvn_file} : %{name} JFlex
%endif
commit jflex for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2022-01-15 21:45:07
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new.1892 (New)
Package is "jflex"
Sat Jan 15 21:45:07 2022 rev:20 rq:946337 version:1.8.2
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2017-10-06
10:55:20.466906400 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new.1892/jflex-bootstrap.changes
2022-01-15 21:45:12.345614278 +0100
@@ -1,0 +2,21 @@
+Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba
+
+- Upgrade to version 1.8.2
+ * fix build with recent java-cup
+- Build the bootstrap package using ant with a generated build.xml
+- Build the non-bootstrap package using maven, since its dependency
+ auto is already built with maven
+- Added patch:
+ * jflex-1.8.2-no-auto-value.patch
++ do not process auto-value-annotations in bootstrap build
++ the generated file is pre-generated outside build for this
+ variant
+- Removed patches:
+ * jflex-byaccj-utl.patch
+ * jflex-classpath.patch
+ * jflex-javac-no-target.patch
+ * jflex-junit4.patch
+ * jflex-no-cup-no-jflex.patch
++ not needed in this version
+
+---
jflex.changes: same change
Old:
jflex-1.4.3.tar.bz2
jflex-byaccj-utl.patch
jflex-classpath.patch
jflex-javac-no-target.patch
jflex-junit4.patch
jflex-no-cup-no-jflex.patch
jflex.script
jpackage-bootstrap-prepare.sh
New:
jflex-1.8.2-generated-files.tar.xz
jflex-1.8.2-no-auto-value.patch
jflex-1.8.2.tar.gz
jflex-build.xml
pre_checkin.sh
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.8QaO7X/_old 2022-01-15 21:45:14.141615229 +0100
+++ /var/tmp/diff_new_pack.8QaO7X/_new 2022-01-15 21:45:14.145615231 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jflex-bootstrap
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,46 +12,40 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
# WARNING: please do not edit this auto generated spec file. Use the
jflex.spec! #
-%define with_bootstrap 1
-%define sectionfree
+%global with_bootstrap 1
+%bcond_withbootstrap
Name: jflex-bootstrap
-# This line is not a comment, please do not remove it!
-#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
-Version:1.4.3
+Version:1.8.2
Release:0
Summary:Lexical Analyzer Generator for Java
-License:GPL-2.0+
+License:BSD-3-Clause
Group: Development/Libraries/Java
-Url:http://www.jflex.de/
-Source0:http://www.jflex.de/jflex-%{version}.tar.bz2
-Source1:jflex.script
-Source100: jpackage-bootstrap-prepare.sh
-Patch0: jflex-javac-no-target.patch
-Patch1: jflex-no-cup-no-jflex.patch
-Patch2: jflex-classpath.patch
-Patch4: jflex-byaccj-utl.patch
-#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with
junit 4
-Patch5: jflex-junit4.patch
+URL:https://www.jflex.de/
+Source0:http://www.jflex.de/release/jflex-%{version}.tar.gz
+Source1:jflex-%{version}-generated-files.tar.xz
+Source2:jflex-build.xml
+Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant
-BuildRequires: java-cup-bootstrap
BuildRequires: java-devel
+BuildRequires: javapackages-local
Requires: java_cup
Requires: javapackages-tools
BuildArch: noarch
-%if %without bootstrap
+%if %{without bootstrap}
+BuildRequires: fdupes
+BuildRequires: java-cup
BuildRequires: jflex-bootstrap
-BuildRequires: junit
+BuildRequires: maven-local
+BuildRequires: mvn(com.google.auto.value:auto-value)
+BuildRequires: mvn(com.google.auto.value:auto-value-annotations)
Conflicts: jflex-bootstrap
%else
+BuildRequires: java-cup-bootstrap
Conflicts: jflex
%endif
@@ -71,89 +65,82 @@
