Notification time stamped 2022-04-29 10:13:45 UTC
From 94416655f098b968c44b747fa58ba6a5251cf7cc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov lemenkov@gmail.com Date: Apr 29 2022 10:13:24 +0000 Subject: PSPP ver. 1.5.5
Signed-off-by: Peter Lemenkov lemenkov@gmail.com
---
diff --git a/pspp-0001-Disable-perl-tests-on-i686.patch b/pspp-0001-Disable-perl-tests-on-i686.patch new file mode 100644 index 0000000..89ba310 --- /dev/null +++ b/pspp-0001-Disable-perl-tests-on-i686.patch @@ -0,0 +1,20 @@ +From: Peter Lemenkov lemenkov@gmail.com +Date: Fri, 29 Apr 2022 11:32:28 +0200 +Subject: [PATCH] Disable perl tests on i686 + +Signed-off-by: Peter Lemenkov lemenkov@gmail.com + +diff --git a/tests/automake.mk b/tests/automake.mk +index f9bea8fa5..2805f3ee5 100644 +--- a/tests/automake.mk ++++ b/tests/automake.mk +@@ -470,8 +470,7 @@ TESTSUITE_AT = \ + tests/ui/terminal/main.at \ + tests/ui/syntax-gen.at \ + tests/utilities/pspp-convert.at \ +- tests/utilities/pspp-output.at \ +- tests/perl-module.at ++ tests/utilities/pspp-output.at + + TESTSUITE = $(srcdir)/tests/testsuite + DISTCLEANFILES += tests/atconfig tests/atlocal diff --git a/pspp-0001-Increase-autoconf-version.patch b/pspp-0001-Increase-autoconf-version.patch deleted file mode 100644 index 8e0233e..0000000 --- a/pspp-0001-Increase-autoconf-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Peter Lemenkov lemenkov@gmail.com -Date: Sun, 4 Oct 2020 23:11:52 +0200 -Subject: [PATCH] Increase autoconf version - -Signed-off-by: Peter Lemenkov lemenkov@gmail.com - -diff --git a/configure.ac b/configure.ac -index d7c7269da..229fb7ca2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ dnl - dnl Process this file with autoconf to produce a configure script. - - dnl Initialize. --AC_PREREQ(2.63) -+AC_PREREQ([2.64]) - AC_INIT([GNU PSPP], [1.4.1], [bug-gnu-pspp@gnu.org], [pspp]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_HEADERS([config.h]) diff --git a/pspp-Smake b/pspp-Smake index b38e980..4bdd895 100644 --- a/pspp-Smake +++ b/pspp-Smake @@ -47,6 +47,7 @@ GNULIB_MODULES = \ environ \ fatal-signal \ fcntl \ + fnmatch \ fpieee \ fprintf-posix \ full-read \ @@ -135,6 +136,7 @@ GNULIB_MODULES = \ unitypes \ unlocked-io \ vasprintf-posix \ + verify \ version-etc \ version-etc-fsf \ vfprintf-posix \ @@ -152,11 +154,11 @@ GNULIB_MODULES = \ xvasprintf
APP_ICONS = \ -src/ui/gui/icons/16x16/apps/pspp.png \ -src/ui/gui/icons/32x32/apps/pspp.png \ -src/ui/gui/icons/48x48/apps/pspp.png \ -src/ui/gui/icons/256x256/apps/pspp.png \ -src/ui/gui/icons/scalable/apps/pspp.svg +src/ui/gui/icons/16x16/apps/org.fsf.pspp.png \ +src/ui/gui/icons/32x32/apps/org.fsf.pspp.png \ +src/ui/gui/icons/48x48/apps/org.fsf.pspp.png \ +src/ui/gui/icons/256x256/apps/org.fsf.pspp.png \ +src/ui/gui/icons/scalable/apps/org.fsf.pspp.svg
CATEGORY_ICONS = \ src/ui/gui/icons/48x48/categories/align-left.png \ @@ -293,6 +295,9 @@ everything: prep_ph icons $(MAKE) -f Smake Makefile.in configure
icons: $(ICONS) +clean-icons: + rm -f $(ICONS) +.PHONY: icons clean-icons
src/ui/gui/icons/manifest: $(MAKEFILE_LIST) $(RM) $@ @@ -331,7 +336,8 @@ prep_ph: touch build-aux/config.rpath $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \ --source-base=gl --lib=libgl --tests-base=tests \ - --doc-base=gl/doc --aux-dir=build-aux \ + --doc-base=gl/doc --aux-dir=build-aux \ + --makefile-name=automake.mk --automake-subdir \ --libtool $(GNULIB_MODULES) if (glibtoolize --version) >/dev/null 2>&1; then \ LIBTOOLIZE=glibtoolize; \ @@ -383,7 +389,7 @@ po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header \ po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po \ po/Makevars.template po/pspp.pot
-clean: +clean: clean-icons rm -f config.sub config.guess config.rpath rm -fr autom4te.cache rm -f aclocal.m4 @@ -399,6 +405,7 @@ clean: rm -f config.h.in~ rm -f config.h.in rm -f gl/Makefile.in + rm -f gl/automake.mk rm -f Makefile.in rm -f build-aux/compile rm -f build-aux/ltmain.sh diff --git a/pspp.spec b/pspp.spec index a49c18f..9584930 100644 --- a/pspp.spec +++ b/pspp.spec @@ -1,17 +1,18 @@ Name: pspp -Version: 1.4.1 -Release: 6%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: A program for statistical analysis of sampled data License: GPLv3+ URL: https://www.gnu.org/software/pspp/ VCS: scm:git:git://git.savannah.gnu.org/pspp.git -Source0: https://ftp.gnu.org/gnu/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar.gz -Source1: https://ftp.gnu.org/gnu/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar.gz.sig +#Source0: https://ftp.gnu.org/gnu/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar.gz +#Source1: https://ftp.gnu.org/gnu/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar.gz.sig +Source0: https://git.savannah.gnu.org/cgit/pspp.git/snapshot/%%7Bname%7D-%%7Bversion%... Source2: pspp-Smake -Patch1: pspp-0001-Increase-autoconf-version.patch -BuildRequires: make +Patch1: pspp-0001-Disable-perl-tests-on-i686.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: cairo-devel BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: gettext @@ -19,11 +20,14 @@ BuildRequires: gettext-devel BuildRequires: gnulib-devel BuildRequires: gsl-devel >= 1.11-2 BuildRequires: gtk3-devel -BuildRequires: gtksourceview3-devel +BuildRequires: gtksourceview4-devel BuildRequires: libpq-devel +BuildRequires: librsvg2-tools BuildRequires: libtool BuildRequires: libxml2 +BuildRequires: make BuildRequires: ncurses-devel +BuildRequires: pango-devel BuildRequires: perl(Config::Perl::V) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) @@ -34,6 +38,8 @@ BuildRequires: python3 BuildRequires: readline-devel BuildRequires: spread-sheet-widget-devel BuildRequires: texinfo +# FIXME +#BuildRequires: texlive-tex Requires: hicolor-icon-theme
@@ -98,14 +104,15 @@ make check %{_bindir}/pspp-dump-sav %{_bindir}/pspp-output %{_bindir}/psppire -%{_datadir}/applications/org.fsf.pspp.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/applications/org.fsf.%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/org.fsf.%{name}.png %{_datadir}/icons/hicolor/*/mimetypes/*.png -%{_datadir}/icons/hicolor/scalable/apps/pspp.svg -%{_datadir}/metainfo/org.fsf.pspp.metainfo.xml -%{_datadir}/mime/packages/pspp.xml +%{_datadir}/icons/hicolor/scalable/apps/org.fsf.%{name}.svg +%{_datadir}/metainfo/org.fsf.%{name}.metainfo.xml +%{_datadir}/mime/packages/org.fsf.%{name}.xml %{_datadir}/pspp/ %{_infodir}/pspp* +%{_infodir}/screenshots/*-ad.png.gz %{_libdir}/%{name}/ %{_mandir}/man1/pspp-convert.1.* %{_mandir}/man1/pspp-dump-sav.* @@ -116,6 +123,9 @@ make check
%changelog +* Thu Apr 28 2022 Peter Lemenkov lemenkov@gmail.com - 1.5.5-1 +- Ver. 1.5.5 + * Fri Jan 21 2022 Fedora Release Engineering releng@fedoraproject.org - 1.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources index 52f8e77..69edc6c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (pspp-1.4.1.tar.gz) = c664a6c6f4f1826db396ad776d81cadc791e4f661c603a7f164f70f9571a84cfae6fec116356b3f950991245b2b0dc9805e75193a055a242558cda1209e7830f -SHA512 (pspp-1.4.1.tar.gz.sig) = 7d4ba27590b62e4b8074db0cc6e2d9d5102ac78c495a917d648ffde126d46bfa42458f7d5ebef004cf60171c5b3795c49d8650407c3ee95049c88249b56b97a3 +SHA512 (pspp-1.5.5.tar.gz) = 18243ea41b9d5709a1762670166c53524c675721769f166ef0c6657f6ba89064e5cab80ee26fc5083a4a96cec54db9b9800707c1029d8da91ad0c9845678bb5c
https://src.fedoraproject.org/rpms/pspp/c/94416655f098b968c44b747fa58ba6a525...
scm-commits@lists.fedoraproject.org