Attachment 14486 Details for Bug 33041 – pari spec patch

[patch] pari spec patch

pari.spec.patch (text/plain), 2.91 KB, created by Aurelian R on 2024-03-31 23:49:48 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-03-31 23:49:48 CEST

Size: 2.91 KB

patch

obsolete

>--- pari/pari.spec	2024-03-30 20:26:01.169828591 +0200
>+++ SPECS/pari.spec	2024-04-01 00:27:10.341384095 +0300
>@@ -1,13 +1,13 @@
>-%global __brp_check_rpaths %{nil}
>-
> %define	lib_major	8
> %define	lib_name	%mklibname %{name} %{lib_major}
> %define develname	%mklibname %{name} -d
> 
>+%bcond_without tests
>+
> Summary:	PARI/GP - Number Theory-oriented Computer Algebra System
> Name:		pari
>-Version:	2.15.0
>-Release:	%mkrel 1
>+Version:	2.15.5
>+Release:	%mkrel 0.1
> License:	GPLv2+
> Group:		Sciences/Mathematics
> URL:		https://pari.math.u-bordeaux.fr/
>@@ -20,11 +20,11 @@ Source5:	https://pari.math.u-bordeaux.fr
> Patch0:		pari-arch.patch
> Patch2:		pari-gphelp.patch
> Patch3:		pari-runpath.patch
>-Patch4:		perl-warning-non-fatal.patch
>-Patch5:		pari-unescaped-left-brace.patch
> BuildRequires:	perl-devel
>+BuildRequires:	fltk-devel
> BuildRequires:	libgmp-devel
> BuildRequires:	pkgconfig(x11)
>+BuildRequires:	pkgconfig(xproto)
> BuildRequires:	pkgconfig(readline)
> BuildRequires:	pkgconfig(ncurses)
> BuildRequires:	texlive
>@@ -79,7 +79,13 @@ applications using pari.
> %prep
> %setup -q -a1 -a2 -a3 -a4 -a5
> mv -f nftables data
>-#autopatch -p1
>+%autopatch -p1
>+
>+# OpenSuse: Donât build DVI docs
>+sed -i -e 's/^$doc all:$ .*/\1/' config/DOC_Make.SH
>+
>+# OpenSuse: disable __DATE__, itâs pointless and can cause rebuilds.
>+sed -i -e 's/__DATE__/"today"/' src/language/paricfg.c
> 
> %build
> %define pkgdocdir	%{_docdir}/%{name}
>@@ -91,30 +97,32 @@ mv -f nftables data
> sh Configure						\
> 	--prefix=%{_prefix}				\
> 	--includedir=%{_includedir}			\
>+	--libdir=%{_libdir}				\
> 	--datadir=%{pkgdatadir}/data			\
> 	--sysdatadir=%{_libdir}/%{name}			\
> 	--share-prefix=%{_datadir}			\
> 	--host=%{_arch}-%{_os}				\
> 	--graphic=X11					\
>+	--with-fltk					\
> 	--with-gmp					\
>-	--libdir=%{_libdir}				\
>-	--disable-tls
>+	--mt=pthread \
>+	--enable-tls
>+#	--disable-tls
> 
> echo "echo %_build_arch-%_build_os" > config/arch-osname
> 
> export PERL_USE_UNSAFE_INC=1
> %ifarch %arm
>-%__make gp
>+%make_build gp
> %else
>-%__make bench
>+%make_build bench
> %endif
> 
>-%__make doc
>+%make_build doc
> 
> %install
> # pari, libpari & libpari-devel
> %make_install						\
>-	READMEDIR='$(DESTDIR)'%{pkgdocdir}		\
> 	LIBDIR='$(DESTDIR)'%{_libdir}			\
> 	DOCDIR='$(DESTDIR)'%{pkgdocdir}
> 
>@@ -140,6 +148,9 @@ perl -pi -e 's@%{buildroot}@@g' \
> 	%{buildroot}%{_datadir}/%{name}-%{version}/data/examples/Makefile \
> 	%{buildroot}%{_libdir}/pari/pari.cfg
> 
>+%check
>+%{?with_tests:%make_build test-all}
>+
> %files
> %config(noreplace) %attr(644,root,root) %{_sysconfdir}/gprc
> %{_bindir}/gp-*
>@@ -150,7 +161,7 @@ perl -pi -e 's@%{buildroot}@@g' \
> %{_mandir}/man1/gp.1*
> %{_mandir}/man1/gp-*.1*
> %{_mandir}/man1/gphelp.1*
>-%doc AUTHORS CHANGES COMPAT README
>+%doc AUTHORS CHANGES COMPAT NEW README
> %dir %{pkgdatadir}
> %{pkgdatadir}/doc
> 
>@@ -159,6 +170,7 @@ perl -pi -e 's@%{buildroot}@@g' \
> %{pkgdatadir}/data/*
> 
> %files	-n %{lib_name}
>+%license COPYING LICENSE
> %{_libdir}/*.so.%{version}
> %{_libdir}/*.so.%{lib_major}
>

--- pari/pari.spec	2024-03-30 20:26:01.169828591 +0200
+++ SPECS/pari.spec	2024-04-01 00:27:10.341384095 +0300
@@ -1,13 +1,13 @@
-%global __brp_check_rpaths %{nil}
-
 %define	lib_major	8
 %define	lib_name	%mklibname %{name} %{lib_major}
 %define develname	%mklibname %{name} -d
 
+%bcond_without tests
+
 Summary:	PARI/GP - Number Theory-oriented Computer Algebra System
 Name:		pari
-Version:	2.15.0
-Release:	%mkrel 1
+Version:	2.15.5
+Release:	%mkrel 0.1
 License:	GPLv2+
 Group:		Sciences/Mathematics
 URL:		https://pari.math.u-bordeaux.fr/
@@ -20,11 +20,11 @@ Source5:	https://pari.math.u-bordeaux.fr
 Patch0:		pari-arch.patch
 Patch2:		pari-gphelp.patch
 Patch3:		pari-runpath.patch
-Patch4:		perl-warning-non-fatal.patch
-Patch5:		pari-unescaped-left-brace.patch
 BuildRequires:	perl-devel
+BuildRequires:	fltk-devel
 BuildRequires:	libgmp-devel
 BuildRequires:	pkgconfig(x11)
+BuildRequires:	pkgconfig(xproto)
 BuildRequires:	pkgconfig(readline)
 BuildRequires:	pkgconfig(ncurses)
 BuildRequires:	texlive
@@ -79,7 +79,13 @@ applications using pari.
 %prep
 %setup -q -a1 -a2 -a3 -a4 -a5
 mv -f nftables data
-#autopatch -p1
+%autopatch -p1
+
+# OpenSuse: Donât build DVI docs
+sed -i -e 's/^\(doc all:\) .*/\1/' config/DOC_Make.SH
+
+# OpenSuse: disable __DATE__, itâs pointless and can cause rebuilds.
+sed -i -e 's/__DATE__/"today"/' src/language/paricfg.c
 
 %build
 %define pkgdocdir	%{_docdir}/%{name}
@@ -91,30 +97,32 @@ mv -f nftables data
 sh Configure						\
 	--prefix=%{_prefix}				\
 	--includedir=%{_includedir}			\
+	--libdir=%{_libdir}				\
 	--datadir=%{pkgdatadir}/data			\
 	--sysdatadir=%{_libdir}/%{name}			\
 	--share-prefix=%{_datadir}			\
 	--host=%{_arch}-%{_os}				\
 	--graphic=X11					\
+	--with-fltk					\
 	--with-gmp					\
-	--libdir=%{_libdir}				\
-	--disable-tls
+	--mt=pthread \
+	--enable-tls
+#	--disable-tls
 
 echo "echo %_build_arch-%_build_os" > config/arch-osname
 
 export PERL_USE_UNSAFE_INC=1
 %ifarch %arm
-%__make gp
+%make_build gp
 %else
-%__make bench
+%make_build bench
 %endif
 
-%__make doc
+%make_build doc
 
 %install
 # pari, libpari & libpari-devel
 %make_install						\
-	READMEDIR='$(DESTDIR)'%{pkgdocdir}		\
 	LIBDIR='$(DESTDIR)'%{_libdir}			\
 	DOCDIR='$(DESTDIR)'%{pkgdocdir}
 
@@ -140,6 +148,9 @@ perl -pi -e 's@%{buildroot}@@g' \
 	%{buildroot}%{_datadir}/%{name}-%{version}/data/examples/Makefile \
 	%{buildroot}%{_libdir}/pari/pari.cfg
 
+%check
+%{?with_tests:%make_build test-all}
+
 %files
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/gprc
 %{_bindir}/gp-*
@@ -150,7 +161,7 @@ perl -pi -e 's@%{buildroot}@@g' \
 %{_mandir}/man1/gp.1*
 %{_mandir}/man1/gp-*.1*
 %{_mandir}/man1/gphelp.1*
-%doc AUTHORS CHANGES COMPAT README
+%doc AUTHORS CHANGES COMPAT NEW README
 %dir %{pkgdatadir}
 %{pkgdatadir}/doc
 
@@ -159,6 +170,7 @@ perl -pi -e 's@%{buildroot}@@g' \
 %{pkgdatadir}/data/*
 
 %files	-n %{lib_name}
+%license COPYING LICENSE
 %{_libdir}/*.so.%{version}
 %{_libdir}/*.so.%{lib_major}

Actions: View | Diff

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