diff --git a/sources b/sources index 957cc32..11e3338 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (z3-4.8.17.tar.gz) = 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d +SHA512 (z3-4.10.2.tar.gz) = d0e54036d403d124a7bbf4cf8de9fd9159bab5151f875b546474563811dfb259bc46650df950802031a180375745fb589acbc79d0065944f0631df378dd6d0c3 diff --git a/z3.spec b/z3.spec index 549023d..d4fe24b 100644 --- a/z3.spec +++ b/z3.spec @@ -1,3 +1,12 @@ +# TODO: A Julia interface is now available, but requires +# https://github.com/JuliaInterop/libcxxwrap-julia, which is not currently +# available in Fedora. + +# TODO: A JavaScript interface is now available. Given the generally poor +# state of JavaScript in Fedora, I do not plan to add a subpackage for it +# unless somebody is really, really persuasive and available to help fix it +# if it breaks. + # Do not embed bad package note paths in the OCaml files. %undefine _package_note_flags @@ -6,8 +15,8 @@ %bcond_with test Name: z3 -Version: 4.8.17 -Release: 6%{?dist} +Version: 4.10.2 +Release: 1%{?dist} Summary: Satisfiability Modulo Theories (SMT) solver License: MIT @@ -48,7 +57,7 @@ Summary: Library for applications that use z3 functionality # This can be removed when F40 reaches EOL %ifnarch %{java_arches} -Obsoletes: java-%{name} < 4.8.17-5 +Obsoletes: java-z3 < 4.8.17-5 %endif %description libs @@ -56,7 +65,7 @@ Library for applications that use z3 functionality. %package devel Summary: Header files for build applications that use z3 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: z3-libs%{?_isa} = %{version}-%{release} %description devel Header files for build applications that use z3. @@ -70,37 +79,37 @@ Summary: API documentation for Z3 API documentation for Z3. %ifarch %{java_arches} -%package -n java-%{name} +%package -n java-z3 Summary: Java interface to z3 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: z3-libs%{?_isa} = %{version}-%{release} Requires: java Requires: javapackages-tools -%description -n java-%{name} +%description -n java-z3 Java interface to z3. %endif -%package -n ocaml-%{name} +%package -n ocaml-z3 Summary: Ocaml interface to z3 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: z3-libs%{?_isa} = %{version}-%{release} -%description -n ocaml-%{name} +%description -n ocaml-z3 Ocaml interface to z3. -%package -n ocaml-%{name}-devel +%package -n ocaml-z3-devel Summary: Files for building ocaml applications that use z3 -Requires: ocaml-%{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-z3%{?_isa} = %{version}-%{release} Requires: ocaml-zarith-devel%{?_isa} -%description -n ocaml-%{name}-devel +%description -n ocaml-z3-devel Files for building ocaml applications that use z3. -%package -n python3-%{name} +%package -n python3-z3 Summary: Python 3 interface to z3 BuildArch: noarch -Requires: %{name}-libs = %{version}-%{release} +Requires: z3-libs = %{version}-%{release} -%description -n python3-%{name} +%description -n python3-z3 Python 3 interface to z3. %prep @@ -113,8 +122,8 @@ sed \ -e 's/@$(CXX)/$(CXX)/' \ -e '/O3/d' \ -e "s/\(['\"]\)cp\([^[:alnum:]]\)/\1cp -p\2/" \ - -e "s/\(SLIBEXTRAFLAGS = '\)'/\1-Wl,--no-whole-archive -Wl,--as-needed'/" \ - -e "/SLIBFLAGS/s|-shared|& %{build_ldflags} -Wl,--whole-archive|" \ + -e "s/\(SLIBEXTRAFLAGS = '\)'/\1-Wl,--no-whole-archive'/" \ + -e '/SLIBFLAGS/s|-shared|& %{build_ldflags} -Wl,--whole-archive|' \ -e 's/\(libz3$(SO_EXT)\)\(\\n\)/\1 -Wl,--no-whole-archive\2/' \ -e "s/OCAML_FLAGS = ''/OCAML_FLAGS = '-g'/" \ -i scripts/mk_util.py @@ -125,23 +134,16 @@ sed -e '/libz3java/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so") -e "s/@MAJVER@/$majver/" \ -i scripts/update_api.py -# Fix character encoding -iconv -f iso8859-1 -t utf-8 RELEASE_NOTES > RELEASE_NOTES.utf8 -touch -r RELEASE_NOTES RELEASE_NOTES.utf8 -mv -f RELEASE_NOTES.utf8 RELEASE_NOTES - %build export LANG="C.UTF-8" export PYTHON="%{python3}" %cmake -G Ninja \ - -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3 \ -DCMAKE_JAVA_COMPILE_FLAGS="-source;1.8;-target;1.8" \ -DZ3_BUILD_DOCUMENTATION:BOOL=ON \ %ifarch %{java_arches} -DZ3_BUILD_JAVA_BINDINGS:BOOL=ON \ -%else - -DZ3_BUILD_JAVA_BINDINGS:BOOL=OFF \ %endif -DZ3_BUILD_PYTHON_BINDINGS:BOOL=ON \ -DZ3_INCLUDE_GIT_HASH:BOOL=OFF \ @@ -175,11 +177,11 @@ export LANG="C.UTF-8" %ifarch %{java_arches} # Move the Java interface to its correct location -mkdir -p %{buildroot}%{_libdir}/%{name} +mkdir -p %{buildroot}%{_libdir}/z3 mkdir -p %{buildroot}%{_jnidir} mv %{buildroot}%{_javadir}/*.jar %{buildroot}%{_jnidir} -ln -s %{_jnidir}/com.microsoft.z3.jar %{buildroot}%{_libdir}/%{name} -mv %{buildroot}%{_libdir}/lib%{name}java.so %{buildroot}%{_libdir}/%{name} +ln -s %{_jnidir}/com.microsoft.z3.jar %{buildroot}%{_libdir}/z3 +mv %{buildroot}%{_libdir}/libz3java.so %{buildroot}%{_libdir}/z3 %endif # Install the OCaml interface @@ -195,7 +197,7 @@ rm -rf %{buildroot}%{_docdir}/Z3 # Make a man page mkdir -p %{buildroot}%{_mandir}/man1 -help2man -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{_vpath_builddir}/%{name} +help2man -N -o %{buildroot}%{_mandir}/man1/z3.1 %{_vpath_builddir}/z3 %if %{with test} %check @@ -207,31 +209,31 @@ cd - %endif %files -%doc README.md RELEASE_NOTES -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%doc README.md RELEASE_NOTES.md +%{_bindir}/z3 +%{_mandir}/man1/z3.1* %files libs %license LICENSE.txt -%{_libdir}/lib%{name}.so.4* +%{_libdir}/libz3.so.4.10* %files devel -%{_includedir}/%{name}/ -%{_libdir}/lib%{name}.so -%{_libdir}/cmake/%{name}/ -%{_libdir}/pkgconfig/%{name}.pc +%{_includedir}/z3/ +%{_libdir}/libz3.so +%{_libdir}/cmake/z3/ +%{_libdir}/pkgconfig/z3.pc %files doc %doc %{_vpath_builddir}/doc/api/html examples %license LICENSE.txt %ifarch %{java_arches} -%files -n java-%{name} -%{_libdir}/%{name}/ +%files -n java-z3 +%{_libdir}/z3/ %{_jnidir}/com.microsoft.z3*jar %endif -%files -n ocaml-%{name} +%files -n ocaml-z3 %dir %{ocamldir}/Z3/ %{ocamldir}/Z3/META %{ocamldir}/Z3/*.cma @@ -239,16 +241,19 @@ cd - %{ocamldir}/Z3/*.cmxs %{ocamldir}/stublibs/*.so -%files -n ocaml-%{name}-devel +%files -n ocaml-z3-devel %{ocamldir}/Z3/*.a %{ocamldir}/Z3/*.cmx %{ocamldir}/Z3/*.cmxa %{ocamldir}/Z3/*.mli -%files -n python3-%{name} -%{python3_sitelib}/%{name}/ +%files -n python3-z3 +%{python3_sitelib}/z3/ %changelog +* Mon Aug 8 2022 Jerry James - 4.10.2-1 +- Version 4.10.2 + * Sat Jul 23 2022 Fedora Release Engineering - 4.8.17-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild