Attachment 14484 Details for Bug 33041 – cm spec patch

[patch] cm spec patch

cm.spec.patch (text/plain), 3.19 KB, created by Aurelian R on 2024-03-31 23:41:37 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-03-31 23:41:37 CEST

Size: 3.19 KB

patch

obsolete

>--- cm/cm.spec	2024-03-30 22:21:33.784473613 +0200
>+++ SPECS/cm.spec	2024-03-31 22:36:39.692059160 +0300
>@@ -1,25 +1,23 @@
>-%define mpfpxmaj	0
> %define libmajor	1
>-%define libmpfpx	%mklibname mpfpx %{mpfpxmaj}
> %define libname		%mklibname %{name} %{libmajor}
> %define libname_devel	%mklibname %{name} -d
> 
> Summary:	Ring class fields of imaginary quadratic number fields and of elliptic curves
> Name:		cm
>-Version:	0.3
>-Release:	%mkrel 12
>+Version:	0.4.3
>+Release:	%mkrel 0.1
> License:	GPLv2+
> Group:		System/Libraries
> URL:		https://www.multiprecision.org/%{name}
> Source0:	https://www.multiprecision.org/downloads/%{name}-%{version}.tar.gz
>-Patch0:		cm-0.2-link.patch
>+#BuildRequires:	flint-devel  >= 3.0.0
> BuildRequires:	libgmp-devel >= 4.3.2
>-BuildRequires:	pkgconfig(mpfr) >= 2.4.2
>-BuildRequires:	libmpc-devel >= 0.8.2
>-BuildRequires:	mpfrcx-devel >= 0.4
>-BuildRequires:	pari-devel >= 2.5.1
>+BuildRequires:	libmpc-devel >= 1.0.0
>+BuildRequires:	mpfr-devel   >= 3.0.0
>+BuildRequires:	mpfrcx-devel >= 0.6.3
>+BuildRequires:	pari-devel   >= 2.11.0
> BuildRequires:	ntl-devel
>-BuildRequires:	pkgconfig(zlib)
>+BuildRequires:	zlib-devel
> 
> %description
> The CM software implements the construction of ring class fields of
>@@ -30,20 +28,6 @@ applications. For the implemented algori
> of class polynomial computation via floating point approximations,
> Mathematics of Computation 78 (266), 2009, pp. 1089-1107.
> 
>-%package	-n %{libmpfpx}
>-Summary:	Arithmetic of complex numbers with arbitrarily high precision and correct rounding
>-Group:		System/Libraries
>-Conflicts:	%{_lib}cm1 < 0.3-4
>-
>-%description	-n %{libmpfpx}
>-The CM software implements the construction of ring class fields of
>-imaginary quadratic number fields and of elliptic curves with complex
>-multiplication via floating point approximations. It consists of libraries
>-that can be called from within a C program and of executable command line
>-applications. For the implemented algorithms, see A. Enge, The complexity
>-of class polynomial computation via floating point approximations,
>-Mathematics of Computation 78 (266), 2009, pp. 1089-1107.
>-
> %package	-n %{libname}
> Summary:	Arithmetic of complex numbers with arbitrarily high precision and correct rounding
> Group:		System/Libraries
>@@ -68,15 +52,15 @@ Provides:	%{name}-devel = %{version}-%{r
> Development headers and libraries for CM.
> 
> %prep
>-%setup -q
>-%autopatch -p1
>+%autosetup -p1
>+
>+# Fix testing for gcc-14
>+sed -i 's/cm.h/cm-impl.h/' tests/tecpp.c tests/ttwist.c
> 
> %build
> autoreconf -vfi
>-%configure			\
>-	--enable-shared		\
>-	--disable-static
>-
>+%configure \
>+    --disable-static
> %make_build
> 
> %install
>@@ -85,27 +69,23 @@ autoreconf -vfi
> # we don't want these
> find %{buildroot} -name '*.*a' -delete
> 
>-# Disable tests on arm for now
>-%ifarch %{ix86} x86_64
> %check
>-make check
>-%endif
>+%make_build check
> 
> %files
> %{_bindir}/classpol
> %{_bindir}/cm
>+%{_bindir}/ecpp
>+%{_bindir}/ecpp-check
> %{_datadir}/%{name}/
> 
> %files -n %{libname}
>+%doc README NEWS AUTHORS
>+%license COPYING
> %{_libdir}/libcm*.so.%{libmajor}{,.*}
> 
> %files -n %{libname_devel}
> %{_includedir}/cm*.h
> %{_infodir}/cm.info*
> %{_libdir}/libcm*.so
>-%{_includedir}/mp*.h
>-%{_libdir}/libmp*.so
>-
>-%files -n %{libmpfpx}
>-%{_libdir}/libmpfpx.so.%{mpfpxmaj}{,.*}
>

--- cm/cm.spec	2024-03-30 22:21:33.784473613 +0200
+++ SPECS/cm.spec	2024-03-31 22:36:39.692059160 +0300
@@ -1,25 +1,23 @@
-%define mpfpxmaj	0
 %define libmajor	1
-%define libmpfpx	%mklibname mpfpx %{mpfpxmaj}
 %define libname		%mklibname %{name} %{libmajor}
 %define libname_devel	%mklibname %{name} -d
 
 Summary:	Ring class fields of imaginary quadratic number fields and of elliptic curves
 Name:		cm
-Version:	0.3
-Release:	%mkrel 12
+Version:	0.4.3
+Release:	%mkrel 0.1
 License:	GPLv2+
 Group:		System/Libraries
 URL:		https://www.multiprecision.org/%{name}
 Source0:	https://www.multiprecision.org/downloads/%{name}-%{version}.tar.gz
-Patch0:		cm-0.2-link.patch
+#BuildRequires:	flint-devel  >= 3.0.0
 BuildRequires:	libgmp-devel >= 4.3.2
-BuildRequires:	pkgconfig(mpfr) >= 2.4.2
-BuildRequires:	libmpc-devel >= 0.8.2
-BuildRequires:	mpfrcx-devel >= 0.4
-BuildRequires:	pari-devel >= 2.5.1
+BuildRequires:	libmpc-devel >= 1.0.0
+BuildRequires:	mpfr-devel   >= 3.0.0
+BuildRequires:	mpfrcx-devel >= 0.6.3
+BuildRequires:	pari-devel   >= 2.11.0
 BuildRequires:	ntl-devel
-BuildRequires:	pkgconfig(zlib)
+BuildRequires:	zlib-devel
 
 %description
 The CM software implements the construction of ring class fields of
@@ -30,20 +28,6 @@ applications. For the implemented algori
 of class polynomial computation via floating point approximations,
 Mathematics of Computation 78 (266), 2009, pp. 1089-1107.
 
-%package	-n %{libmpfpx}
-Summary:	Arithmetic of complex numbers with arbitrarily high precision and correct rounding
-Group:		System/Libraries
-Conflicts:	%{_lib}cm1 < 0.3-4
-
-%description	-n %{libmpfpx}
-The CM software implements the construction of ring class fields of
-imaginary quadratic number fields and of elliptic curves with complex
-multiplication via floating point approximations. It consists of libraries
-that can be called from within a C program and of executable command line
-applications. For the implemented algorithms, see A. Enge, The complexity
-of class polynomial computation via floating point approximations,
-Mathematics of Computation 78 (266), 2009, pp. 1089-1107.
-
 %package	-n %{libname}
 Summary:	Arithmetic of complex numbers with arbitrarily high precision and correct rounding
 Group:		System/Libraries
@@ -68,15 +52,15 @@ Provides:	%{name}-devel = %{version}-%{r
 Development headers and libraries for CM.
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
+
+# Fix testing for gcc-14
+sed -i 's/cm.h/cm-impl.h/' tests/tecpp.c tests/ttwist.c
 
 %build
 autoreconf -vfi
-%configure			\
-	--enable-shared		\
-	--disable-static
-
+%configure \
+    --disable-static
 %make_build
 
 %install
@@ -85,27 +69,23 @@ autoreconf -vfi
 # we don't want these
 find %{buildroot} -name '*.*a' -delete
 
-# Disable tests on arm for now
-%ifarch %{ix86} x86_64
 %check
-make check
-%endif
+%make_build check
 
 %files
 %{_bindir}/classpol
 %{_bindir}/cm
+%{_bindir}/ecpp
+%{_bindir}/ecpp-check
 %{_datadir}/%{name}/
 
 %files -n %{libname}
+%doc README NEWS AUTHORS
+%license COPYING
 %{_libdir}/libcm*.so.%{libmajor}{,.*}
 
 %files -n %{libname_devel}
 %{_includedir}/cm*.h
 %{_infodir}/cm.info*
 %{_libdir}/libcm*.so
-%{_includedir}/mp*.h
-%{_libdir}/libmp*.so
-
-%files -n %{libmpfpx}
-%{_libdir}/libmpfpx.so.%{mpfpxmaj}{,.*}

Actions: View | Diff

Attachments on bug 33041: 14484 | 14485 | 14486 | 14487