Hello community, here is the log from the commit of package superlu for openSUSE:Factory checked in at 2020-11-09 13:56:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/superlu (Old) and /work/SRC/openSUSE:Factory/.superlu.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "superlu" Mon Nov 9 13:56:17 2020 rev:25 rq:846305 version:5.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/superlu/superlu.changes 2020-09-14 12:15:55.612400138 +0200 +++ /work/SRC/openSUSE:Factory/.superlu.new.11331/superlu.changes 2020-11-09 13:56:38.772064239 +0100 @@ -1,0 +2,16 @@ +Mon Oct 26 14:11:13 UTC 2020 - Ana Guerrero Lopez <[email protected]> + +- New version 5.2.2 (boo#1178112) + - bugfixes, documentation and examples update. +- Update URL and Source0 and Source1, use get_tarball.sh to remove + non distributable files. +- Install superlu_ug.pdf provided by the tarball. +- Remove patch, merged upstream + * superlu-4.3-include.patch + * superlu-4.3-dont-opt-away.diff + * superlu-5.2-make.patch +- Refresh patch: + * superlu-examples_Makefile_remove_itersol.patch + * superlu-make.linux.patch + +------------------------------------------------------------------- Old: ---- superlu-4.3-dont-opt-away.diff superlu-4.3-include.patch superlu-5.2-make.patch superlu_5.2.1.tar.gz superlu_ug.pdf New: ---- get-tarball.sh superlu-5.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ superlu.spec ++++++ --- /var/tmp/diff_new_pack.fuyaWw/_old 2020-11-09 13:56:41.992057217 +0100 +++ /var/tmp/diff_new_pack.fuyaWw/_new 2020-11-09 13:56:41.996057209 +0100 @@ -20,9 +20,7 @@ # Base package name %define pname superlu -%define ver 5.2.1 - -%define _ver %(echo %{ver} | tr . _) +%define ver 5.2.2 %if "%flavor" == "" ExclusiveArch: do_not_build @@ -77,7 +75,6 @@ %define libname lib%{name}%{?_sover} %else %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} -%define package_name %{hpc_package_name %_ver} %define p_prefix %hpc_prefix %define p_includedir %hpc_includedir %define p_libdir %hpc_libdir @@ -90,15 +87,11 @@ Group: Productivity/Scientific/Math Version: %{ver} Release: 0 -Source: http://crd-legacy.lbl.gov/%7Exiaoye/SuperLU/%{pname}_%{version}.tar.gz -Source1: superlu_ug.pdf +URL: https://portal.nersc.gov/project/sparse/superlu/ +Source0: superlu-5.2.2.tar.gz +# Tarball above is generated with the script below +Source1: get-tarball.sh Source2: README.SUSE -# PATCH-FEATURE-OPENSUSE superlu-5.2-make.patch : add compiler and build flags in make.inc -Patch0: superlu-5.2-make.patch -# PATCH-FIX-UPSTREAM superlu-4.3-include.patch : avoid implicit declaration warnings -Patch1: superlu-4.3-include.patch -# PATCH-FIX-UPSTREAM superlu-4.3-dont-opt-away.diff -Patch2: superlu-4.3-dont-opt-away.diff # PATCH-FIX-OPENSUSE superlu-5.2-remove-mc64ad.patch [bnc#796236] # The Harwell Subroutine Library (HSL) routine mc64ad.c have been removed # from the original sources for legal reasons. This patch disables the inclusion of @@ -106,7 +99,6 @@ Patch3: superlu-5.2-remove-mc64ad.patch Patch4: superlu-examples_Makefile_remove_itersol.patch Patch5: superlu-make.linux.patch -URL: http://crd.lbl.gov/~xiaoye/SuperLU/ BuildRequires: cmake >= 2.8.12 BuildRequires: fdupes BuildRequires: tcsh @@ -180,14 +172,11 @@ %endif %prep -%setup -q -n SuperLU_%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n superlu-%{version} %patch3 -p1 -%patch4 -p0 -%patch5 -p0 -cp %SOURCE1 %SOURCE2 ./ +%patch4 -p1 +%patch5 -p1 +cp %SOURCE2 ./ # Create baselibs.conf dynamically (non-HPC build only). %if %{without hpc} cat > %{_sourcedir}/baselibs.conf <<EOF @@ -290,9 +279,13 @@ %{?with_hpc:%{hpc_pkgconfig_file}} %{p_includedir}/%{!?with_hpc:*} %{p_libdir}/*.so +%dir %{p_libdir}/cmake/ +%dir %{p_libdir}/cmake/superlu/ +%{p_libdir}/cmake/superlu/*.cmake +%{p_libdir}/pkgconfig/superlu.pc %files doc -%doc DOC/html superlu_ug.pdf +%doc DOC/html DOC/ug.pdf %files examples %doc examples ++++++ get-tarball.sh ++++++ #!/bin/bash set -e VERSION=5.2.2 FILES="mc64ad.c sgsisx.c sldperm.c dgsisx.c dldperm.c cgsisx.c cldperm.c zgsisx.c zldperm.c" URL="https://github.com/xiaoyeli/superlu/archive/v$VERSION/superlu-$VERSION.tar.gz"; TAR="superlu-$VERSION.tar.gz" WORKDIR="$(mktemp -d superlu.XXXX)" TODIR="$(pwd)" cd "$WORKDIR" wget $URL tar xfz superlu-$VERSION.tar.gz for file in $FILES; do rm superlu-$VERSION/SRC/$file done if [ -e "$TODIR/$TAR" ]; then echo "$TAR already exists." else tar cfz "$TODIR/$TAR" superlu-$VERSION fi cd "$TODIR" rm -r "$WORKDIR" ++++++ superlu-5.2-remove-mc64ad.patch ++++++ --- /var/tmp/diff_new_pack.fuyaWw/_old 2020-11-09 13:56:42.056057077 +0100 +++ /var/tmp/diff_new_pack.fuyaWw/_new 2020-11-09 13:56:42.056057077 +0100 @@ -1,14 +1,15 @@ ---- a/SRC/CMakeLists.txt 2016-05-29 13:57:44.683251096 +0200 -+++ b/SRC/CMakeLists.txt 2016-05-29 13:57:31.570987497 +0200 -@@ -22,7 +22,6 @@ +diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -21,7 +21,6 @@ ilu_relax_snode.c ilu_heap_relax_snode.c mark_relax.c - mc64ad.c qselect.c input_error.c - ) -@@ -63,9 +62,7 @@ + dmach.c +@@ -65,9 +64,7 @@ smemory.c sutil.c smyblas2.c @@ -18,7 +19,7 @@ ilu_sdrop_row.c ilu_ssnode_dfs.c ilu_scolumn_dfs.c -@@ -112,9 +109,7 @@ +@@ -115,9 +112,7 @@ dmemory.c dutil.c dmyblas2.c @@ -28,7 +29,7 @@ ilu_ddrop_row.c ilu_dsnode_dfs.c ilu_dcolumn_dfs.c -@@ -163,9 +158,7 @@ +@@ -168,9 +163,7 @@ cmemory.c cutil.c cmyblas2.c @@ -38,7 +39,7 @@ ilu_cdrop_row.c ilu_csnode_dfs.c ilu_ccolumn_dfs.c -@@ -213,9 +206,7 @@ +@@ -219,9 +212,7 @@ zmemory.c zutil.c zmyblas2.c ++++++ superlu-examples_Makefile_remove_itersol.patch ++++++ --- /var/tmp/diff_new_pack.fuyaWw/_old 2020-11-09 13:56:42.068057051 +0100 +++ /var/tmp/diff_new_pack.fuyaWw/_new 2020-11-09 13:56:42.068057051 +0100 @@ -1,6 +1,7 @@ ---- EXAMPLE/Makefile 2019-02-08 09:57:41.220000000 +0100 -+++ EXAMPLE/Makefile.patched 2019-02-08 10:23:18.464000000 +0100 -@@ -40,8 +40,6 @@ +diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile +--- a/EXAMPLE/Makefile ++++ b/EXAMPLE/Makefile +@@ -39,8 +39,6 @@ SLINXEXM1 = slinsolx1.o SLINXEXM2 = slinsolx2.o SLINXEXM3 = slinsolx3.o @@ -9,7 +10,7 @@ DLINEXM = dlinsol.o DLINEXM1 = dlinsol1.o -@@ -50,8 +48,6 @@ +@@ -49,8 +47,6 @@ DLINXEXM2 = dlinsolx2.o DLINXEXM3 = dlinsolx3.o SUPERLUEXM = superlu.o sp_ienv.o @@ -18,7 +19,7 @@ CLINEXM = clinsol.o CLINEXM1 = clinsol1.o -@@ -59,8 +55,6 @@ +@@ -58,8 +54,6 @@ CLINXEXM1 = clinsolx1.o CLINXEXM2 = clinsolx2.o CLINXEXM3 = clinsolx3.o @@ -27,7 +28,7 @@ ZLINEXM = zlinsol.o ZLINEXM1 = zlinsol1.o -@@ -68,20 +62,17 @@ +@@ -67,20 +61,17 @@ ZLINXEXM1 = zlinsolx1.o ZLINXEXM2 = zlinsolx2.o ZLINXEXM3 = zlinsolx3.o @@ -54,7 +55,7 @@ slinsol: $(SLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@ -@@ -101,11 +92,6 @@ +@@ -100,11 +91,6 @@ slinsolx3: $(SLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@ @@ -66,7 +67,7 @@ dlinsol: $(DLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@ -@@ -128,12 +114,6 @@ +@@ -127,12 +113,6 @@ superlu: $(SUPERLUEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@ @@ -79,7 +80,7 @@ clinsol: $(CLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@ -@@ -152,12 +132,6 @@ +@@ -151,12 +131,6 @@ clinsolx3: $(CLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@ @@ -92,7 +93,7 @@ zlinsol: $(ZLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@ -@@ -176,11 +150,6 @@ +@@ -175,11 +149,6 @@ zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@ @@ -103,13 +104,10 @@ - $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@ .c.o: - $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE) -@@ -190,7 +159,7 @@ + $(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE) +@@ -189,7 +158,7 @@ clean: rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \ - superlu *itersol *itersol1 + superlu - - - ++++++ superlu-make.linux.patch ++++++ --- /var/tmp/diff_new_pack.fuyaWw/_old 2020-11-09 13:56:42.076057034 +0100 +++ /var/tmp/diff_new_pack.fuyaWw/_new 2020-11-09 13:56:42.076057034 +0100 @@ -1,5 +1,6 @@ ---- MAKE_INC/make.linux 2016-05-22 17:58:44.000000000 +0200 -+++ MAKE_INC/make.linux.patched 2019-02-08 10:35:38.740265921 +0100 +diff -Nrua a/MAKE_INC/make.linux b/MAKE_INC/make.linux +--- a/MAKE_INC/make.linux ++++ b/MAKE_INC/make.linux @@ -21,8 +21,8 @@ # # The name of the libraries to be created/linked to
