Sync from SUSE:SLFO:Main jurand revision 542180dbe37afcf1c511aa75e421a7ba
This commit is contained in:
commit
233f4b9880
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
|
|
@ -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
|
||||
BIN
jurand-1.3.2.tar.gz
(Stored with Git LFS)
Normal file
BIN
jurand-1.3.2.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
34
jurand-cxx20.patch
Normal file
34
jurand-cxx20.patch
Normal file
|
|
@ -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())
|
||||
{
|
||||
34
jurand.changes
Normal file
34
jurand.changes
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
-------------------------------------------------------------------
|
||||
Wed Apr 10 06:01:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Simplify a bit the g++ BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 14:01:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 14 08:51:29 UTC 2023 - Wang Jun <badboywj@gmail.com>
|
||||
|
||||
- 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 <fstrba@suse.com>
|
||||
|
||||
- Use the %%gcc_version macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 27 07:04:00 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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 <fstrba@suse.com>
|
||||
|
||||
- Initial packaging with version 1.3.1
|
||||
77
jurand.spec
Normal file
77
jurand.spec
Normal file
|
|
@ -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: %{rb_default_ruby_suffix}-rubygem-asciidoctor
|
||||
BuildRequires: diffutils
|
||||
BuildRequires: gcc%{?with_gcc}-c++
|
||||
BuildRequires: make
|
||||
BuildRequires: xmlto
|
||||
|
||||
%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
|
||||
Loading…
Reference in New Issue
Block a user