diff --git a/julia-rpmlintrc b/julia-rpmlintrc index 636259f..e280502 100644 --- a/julia-rpmlintrc +++ b/julia-rpmlintrc @@ -5,5 +5,4 @@ addFilter("E: arch-dependent-file-in-usr-share*") # We should not unstrip sofiles or binaries generated from this package # https://github.com/JuliaLang/julia/issues/17941 addFilter("unstripped-binary-or-object") -# Julia should be an exception. Otherwise, it fails to execute :) -addFilter("devel-dependency") +addFilter("W: hidden-file-or-dir /usr/share/julia/stdlib/v1.9/Pkg/test/test_packages/AugmentedPlatform/*") diff --git a/julia.changes b/julia.changes index 42b53ef..6944a54 100644 --- a/julia.changes +++ b/julia.changes @@ -1,13 +1,14 @@ ------------------------------------------------------------------- -Sun Dec 17 13:00:29 UTC 2023 - Soc Virnyl Estela +Mon Dec 18 02:13:44 UTC 2023 - Soc Virnyl Estela -- libjulia19 package should be unambiguous if it is for julia-compat or julia - -------------------------------------------------------------------- -Sun Dec 17 10:46:54 UTC 2023 - Soc Virnyl Estela - -- There should be a package libjulia19. -- CFLAGS and CXXFLAGS use %optflags. +- There should be a package libjulia1. +- CFLAGS and CXXFLAGS use provided %optflags. +- libjulia-compat1 should provide libjulia1 to fulfill soname shlib naming policies. +- Remove unused rpmlints: + * devel-dependency +- Turn all eol encondings to unix to all files +- Add rpmlint for "W: hidden-file-or-dir /usr/share/julia/stdlib/v1.9/Pkg/test/test_packages/AugmentedPlatform/.pkg" + That contains julia scripts. Leave it alone. ------------------------------------------------------------------- Wed Dec 13 00:36:26 UTC 2023 - Soc Virnyl Estela diff --git a/julia.spec b/julia.spec index 2c5c489..3c367ac 100644 --- a/julia.spec +++ b/julia.spec @@ -40,9 +40,9 @@ %endif %if 0%{?compat_mode} -%define libname libjulia-compat%{libjulia_sover_major}%{libjulia_sover_minor} +%define libname libjulia-compat%{libjulia_sover_major} %else -%define libname libjulia%{libjulia_sover_major}%{libjulia_sover_minor} +%define libname libjulia%{libjulia_sover_major} %endif # LTO currently makes building blastrampoline and Julia itself fail @@ -187,8 +187,8 @@ debugging Julia itself. Summary: Julia shared object libraries Group: System/Libraries %if 0%{?compat_mode} -Conflicts: libjulia%{libjulia_sover_major}%{libjulia_sover_minor} -Provides: libjulia%{libjulia_sover_major}%{libjulia_sover_minor} +Conflicts: libjulia%{libjulia_sover_major} +Provides: libjulia%{libjulia_sover_major} %endif %description -n %{libname} @@ -264,7 +264,7 @@ sed "s/ \$(build_prefix)\\/manifest\\/zlib//" -i deps/llvm.mk %define julia_march x86-64 %endif -%ifarch armv6l armv6hl aarch64 +%ifarch armv6l armv6hl export LDFLAGS="$LDFLAGS -latomic" %endif @@ -342,6 +342,11 @@ fi # make %{?_smp_mflags} test %install + +%ifarch armv6l armv6hl +export LDFLAGS="$LDFLAGS -latomic" +%endif + export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" export LD_LIBRARY_PATH=%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir}:%{_builddir}/%{buildsubdir}/usr/lib @@ -439,7 +444,7 @@ rm %{buildroot}%{_datadir}/appdata/julia.appdata.xml # Remove duplicated files. %fdupes %{buildroot} -%suse_update_desktop_file -r julia Science Math +%suse_update_desktop_file -r julia-base Science Math mv %{buildroot}%{_bindir}/julia %{buildroot}%{_bindir}/julia-base mkdir -p %{buildroot}%{_sysconfdir}/alternatives @@ -451,6 +456,12 @@ fi ln -sf %{_sysconfdir}/alternatives/julia %{buildroot}%{_bindir}/julia +# Convert all eol encodings to Unix +find %{buildroot} -type f -execdir dos2unix -k {} \; + +# make it executable +chmod +x %{buildroot}%{_datadir}/julia/stdlib/v1.9/SparseArrays/gen/generator.jl + %post %{_sbindir}/update-alternatives --install %{_bindir}/julia \ julia %{_bindir}/julia-base 5