From 724964bd6dd830d52a5173cdaaf0545639909398715cd7b7df4e58502ee8d86c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 18 Apr 2024 05:10:42 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jurand?expand=0&rev=15 --- .gitattributes | 23 ++++++++++++++ .gitignore | 1 + jurand-1.3.2.tar.gz | 3 ++ jurand-cxx20.patch | 34 ++++++++++++++++++++ jurand.changes | 34 ++++++++++++++++++++ jurand.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 172 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 jurand-1.3.2.tar.gz create mode 100644 jurand-cxx20.patch create mode 100644 jurand.changes create mode 100644 jurand.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/jurand-1.3.2.tar.gz b/jurand-1.3.2.tar.gz new file mode 100644 index 0000000..acb5245 --- /dev/null +++ b/jurand-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05c1fa356e2ad4247265ac77e6837faf24a6e291742b2c123f248b85a5edd1dc +size 19194 diff --git a/jurand-cxx20.patch b/jurand-cxx20.patch new file mode 100644 index 0000000..a82f851 --- /dev/null +++ b/jurand-cxx20.patch @@ -0,0 +1,34 @@ +diff -auNr jurand-1.3.2-orig/Makefile jurand-1.3.2/Makefile +--- jurand-1.3.2-orig/Makefile 2023-12-14 16:27:32.535474016 +0800 ++++ jurand-1.3.2/Makefile 2023-12-14 16:28:45.112770530 +0800 +@@ -12,6 +12,9 @@ + test: test.sh test-compile + @./$< + ++CXXFLAGS += -g -std=gnu++2a -Isrc -Wall -Wextra -Wpedantic -D_GLIBCXX_USE_CXX11_ABI=1 ++LDFLAGS += -pthread ++ + $(call Executable_file,jurand): $(call Object_file,jurand.cpp) + $(call Executable_file,jurand_test): $(call Object_file,jurand_test.cpp) + +diff -auNr jurand-1.3.2-orig/src/java_symbols.hpp jurand-1.3.2/src/java_symbols.hpp +--- jurand-1.3.2-orig/src/java_symbols.hpp 2023-12-14 16:27:32.535474016 +0800 ++++ jurand-1.3.2/src/java_symbols.hpp 2023-12-14 16:30:01.613434431 +0800 +@@ -636,14 +636,14 @@ + + if (not parameters.in_place_) + { +- auto osyncstream = std::osyncstream(std::cout); ++ auto oss = std::osyncstream(std::cout); + + if (not path.empty()) + { +- osyncstream << path.native() << ":\n"; ++ oss << path.native() << ":\n"; + } + +- osyncstream.write(content.c_str(), content.size()); ++ oss.write(content.c_str(), content.size()); + } + else if (content.size() < original_content.size()) + { diff --git a/jurand.changes b/jurand.changes new file mode 100644 index 0000000..296542b --- /dev/null +++ b/jurand.changes @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Wed Apr 10 06:01:59 UTC 2024 - Fridrich Strba + +- Simplify a bit the g++ BuildRequires + +------------------------------------------------------------------- +Wed Feb 21 14:01:27 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Thu Dec 14 08:51:29 UTC 2023 - Wang Jun + +- Update to version 1.3.2 + * see https://github.com/fedora-java/jurand/compare/1.3.1...1.3.2 + +------------------------------------------------------------------- +Wed Nov 15 18:07:06 UTC 2023 - Fridrich Strba + +- Use the %%gcc_version macro + +------------------------------------------------------------------- +Wed Sep 27 07:04:00 UTC 2023 - Fridrich Strba + +- Added patch: + * jurand-cxx20.patch + + fix name class between osyncstream variable and + std::osyncstream + + allow building on SLE-12-SP5 and SLE-15-SP2 + +------------------------------------------------------------------- +Wed Sep 27 05:00:00 UTC 2023 - Fridrich Strba + +- Initial packaging with version 1.3.1 diff --git a/jurand.spec b/jurand.spec new file mode 100644 index 0000000..c1a82c0 --- /dev/null +++ b/jurand.spec @@ -0,0 +1,77 @@ +# +# spec file for package jurand +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d} +%{!?make_build:%global make_build make %{?_smp_mflags}} +%if 0%{?gcc_version} < 11 +%define with_gcc 11 +%endif +Name: jurand +Version: 1.3.2 +Release: 0 +Summary: A tool for manipulating Java symbols +License: Apache-2.0 +Group: Development/Languages/Java +URL: https://github.com/fedora-java/jurand +Source0: https://github.com/fedora-java/jurand/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: jurand-cxx20.patch +BuildRequires: diffutils +BuildRequires: gcc%{?with_gcc}-c++ +BuildRequires: make +BuildRequires: xmlto +BuildRequires: rubygem(asciidoctor) + +%description +The tool can be used for patching .java sources in cases where using sed is +insufficient due to Java language syntax. The tool follows Java language rules +rather than applying simple regular expressions on the source code. + +%prep +%setup -q +%patch -P 0 -p1 + +%build + +%if 0%{?with_gcc} +export CXX=g++-%{with_gcc} +export CC=gcc-%{with_gcc} +%endif +%make_build test-compile manpages + +%install +export buildroot=%{buildroot} +export bindir=%{_bindir} +export rpmmacrodir=%{_rpmmacrodir} +export mandir=%{_mandir}/man7 + +./install.sh + +%check +%if 0%{?with_gcc} +export CXX=g++-%{with_gcc} +export CC=gcc-%{with_gcc} +%endif +%make_build test + +%files -f target/installed_files +%dir %{_rpmconfigdir} +%dir %{_rpmmacrodir} +%license LICENSE NOTICE +%doc README.adoc + +%changelog From 0c2578ad8898a05d710f1b317e1a37ff9d4ebe4a592e230ce3000f7c5d8bad9c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 9 Sep 2024 13:10:52 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jurand?expand=0&rev=16 --- jurand-1.3.3.tar.gz | 3 +++ jurand.changes | 12 ++++++++++++ jurand.spec | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 jurand-1.3.3.tar.gz diff --git a/jurand-1.3.3.tar.gz b/jurand-1.3.3.tar.gz new file mode 100644 index 0000000..581daae --- /dev/null +++ b/jurand-1.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cfcd88b2c173b898c32ee9bbcc3db6c5831518977dcb546a142e6cf1c0b875e +size 19337 diff --git a/jurand.changes b/jurand.changes index 296542b..181c782 100644 --- a/jurand.changes +++ b/jurand.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 9 13:07:10 UTC 2024 - Fridrich Strba + +- Upgrade to version 1.3.3 + * Changes: + + Add suffix to manpage source files + + Fix install script + + Rename size to content_size + + Fix use after free bug + + Update GH Action checkout to v4 + + Add tests for package-info.java + ------------------------------------------------------------------- Wed Apr 10 06:01:59 UTC 2024 - Fridrich Strba diff --git a/jurand.spec b/jurand.spec index c1a82c0..540dce0 100644 --- a/jurand.spec +++ b/jurand.spec @@ -22,7 +22,7 @@ %define with_gcc 11 %endif Name: jurand -Version: 1.3.2 +Version: 1.3.3 Release: 0 Summary: A tool for manipulating Java symbols License: Apache-2.0 From d75791ec0ccae0f6f35f0e72cc63899b862482dd836207207dea2e9bac005626 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 9 Sep 2024 13:11:37 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jurand?expand=0&rev=17 --- jurand-1.3.2.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 jurand-1.3.2.tar.gz diff --git a/jurand-1.3.2.tar.gz b/jurand-1.3.2.tar.gz deleted file mode 100644 index acb5245..0000000 --- a/jurand-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05c1fa356e2ad4247265ac77e6837faf24a6e291742b2c123f248b85a5edd1dc -size 19194