From 76a7eaecba8b9c6cb650f767ac5166a7b3abb71cd85a5fa4f1da3d1f9da4de25 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Dec 2023 11:54:58 +0000 Subject: [PATCH] Accepting request 1133013 from home:jgwang:branches:Java:packages - Update to version 1.3.2 * see https://github.com/fedora-java/jurand/compare/1.3.1...1.3.2 OBS-URL: https://build.opensuse.org/request/show/1133013 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jurand?expand=0&rev=5 --- jurand-1.3.1.tar.gz | 3 --- jurand-1.3.2.tar.gz | 3 +++ jurand-cxx20.patch | 22 +++++++++++----------- jurand.changes | 6 ++++++ jurand.spec | 6 +++--- 5 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 jurand-1.3.1.tar.gz create mode 100644 jurand-1.3.2.tar.gz diff --git a/jurand-1.3.1.tar.gz b/jurand-1.3.1.tar.gz deleted file mode 100644 index e15fc0e..0000000 --- a/jurand-1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9834fa3b966c3cea2079c129ba65b2f53d32ffd7c01bdb6716f874daca37b537 -size 18355 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 index e259088..a82f851 100644 --- a/jurand-cxx20.patch +++ b/jurand-cxx20.patch @@ -1,20 +1,20 @@ -diff -urEbwB jurand-1.3.1.orig/Makefile jurand-1.3.1/Makefile ---- jurand-1.3.1.orig/Makefile 2023-09-27 07:17:18.384159160 +0200 -+++ jurand-1.3.1/Makefile 2023-09-27 08:55:18.229794175 +0200 -@@ -12,7 +12,8 @@ +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=c++2a -Isrc -Wall -Wextra -Wpedantic +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) - $(eval $(call Variable_rule,target/compile_flags,$(CXX) $(CXXFLAGS))) - $(eval $(call Variable_rule,target/link_flags,$(CXX) $(LDFLAGS) $(LDLIBS))) -diff -urEbwB jurand-1.3.1.orig/src/java_symbols.hpp jurand-1.3.1/src/java_symbols.hpp ---- jurand-1.3.1.orig/src/java_symbols.hpp 2023-09-27 07:17:18.384159160 +0200 -+++ jurand-1.3.1/src/java_symbols.hpp 2023-09-27 08:42:56.218651442 +0200 -@@ -630,14 +630,14 @@ +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_) { diff --git a/jurand.changes b/jurand.changes index 8b5fa02..036fe0c 100644 --- a/jurand.changes +++ b/jurand.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/jurand.spec b/jurand.spec index d060f1e..303050b 100644 --- a/jurand.spec +++ b/jurand.spec @@ -22,7 +22,7 @@ %define with_gcc 11 %endif Name: jurand -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: A tool for manipulating Java symbols License: Apache-2.0 @@ -30,7 +30,7 @@ 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: asciidoc +BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor BuildRequires: diffutils BuildRequires: make BuildRequires: xmlto @@ -76,6 +76,6 @@ export CC=gcc-%{with_gcc} %dir %{_rpmconfigdir} %dir %{_rpmmacrodir} %license LICENSE NOTICE -%doc README.md +%doc README.adoc %changelog