commit f0ca7162a5b6c4ff6d66c597de0d2a91bdd13403
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 15 06:32:08 2022 +0200
- updated to 1.6.0
pspp-perl.patch | 13 ++++++-------
pspp.spec | 27 +++++++++++++++------------
2 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/pspp.spec b/pspp.spec
index 91111a3..4a8fc44 100644
--- a/pspp.spec
+++ b/pspp.spec
@@ -6,23 +6,23 @@
Summary: GNU PSPP - program for statistical analysis of sampled data
Summary(pl.UTF-8): GNU PSPP - program do analizy statystycznej danych
próbkowanych
Name: pspp
-Version: 1.4.1
-Release: 4
+Version: 1.6.0
+Release: 1
License: GPL v3+
Group: Applications/Science
Source0: https://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
-# Source0-md5: 7852af2e4f5ac1b57bd2c1636dca7b40
+# Source0-md5: bf6d08ebc7fa5879d0e0eeb96c4ebf75
Patch0: %{name}-info.patch
Patch1: %{name}-perl.patch
URL: http://www.gnu.org/software/pspp/
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10.1
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.14
BuildRequires: cairo-devel >= 1.5
BuildRequires: gettext-tools >= 0.20
BuildRequires: glib2-devel >= 1:2.44
BuildRequires: gsl-devel >= 1.13
BuildRequires: gtk+3-devel >= 3.22.0
-BuildRequires: gtksourceview3-devel >= 3.4.2
+BuildRequires: gtksourceview4-devel >= 4.0
%{?with_glade:BuildRequires: glade-devel >= 3.0}
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.0
@@ -32,10 +32,11 @@ BuildRequires: perl-base >= 5.005_03
%{?with_perl:BuildRequires: perl-devel >= 1:5.8}
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
+BuildRequires: python3 >= 1:3
BuildRequires: readline-devel
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.745
-BuildRequires: spread-sheet-widget-devel >= 0.6
+BuildRequires: spread-sheet-widget-devel >= 0.7
BuildRequires: texinfo
BuildRequires: zlib-devel
Requires(post,postun): desktop-file-utils
@@ -44,10 +45,10 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: cairo >= 1.5
Requires: glib2 >= 1:2.44
Requires: gtk+3 >= 3.22.0
-Requires: gtksourceview3 >= 3.4.2
+Requires: gtksourceview4 >= 4.0
Requires: pango >= 1:1.22
Requires: shared-mime-info
-Requires: spread-sheet-widget >= 0.6
+Requires: spread-sheet-widget >= 0.7
%if %{without glade}
Obsoletes: pspp-glade < 1.4.1
%endif
@@ -164,12 +165,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/psppire
%{_datadir}/pspp
%{_datadir}/metainfo/org.fsf.pspp.metainfo.xml
-%{_datadir}/mime/packages/pspp.xml
+%{_datadir}/mime/packages/org.fsf.pspp.xml
%{_desktopdir}/org.fsf.pspp.desktop
-%{_iconsdir}/hicolor/*/apps/pspp.*
-%{_iconsdir}/hicolor/*/mimetypes/application-x-spss-*.png
+%{_iconsdir}/hicolor/*/apps/org.fsf.pspp.*
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-spss-*.png
%{_infodir}/pspp.info*
%{_infodir}/pspp-dev.info*
+%{_infodir}/pspp-figures
+%{_infodir}/screenshots
%{_mandir}/man1/pspp.1*
%{_mandir}/man1/pspp-output.1*
%{_mandir}/man1/psppire.1*
diff --git a/pspp-perl.patch b/pspp-perl.patch
index 21b637c..98220f8 100644
--- a/pspp-perl.patch
+++ b/pspp-perl.patch
@@ -1,12 +1,11 @@
-diff -urNp -x '*.orig' pspp-1.4.1.org/perl-module/automake.mk
pspp-1.4.1/perl-module/automake.mk
---- pspp-1.4.1.org/perl-module/automake.mk 2019-12-02 00:53:52.000000000
+0100
-+++ pspp-1.4.1/perl-module/automake.mk 2021-05-07 23:43:28.144811523 +0200
-@@ -42,7 +42,7 @@ perl-module/pspp-module-config: Makefile
- echo ');') > $(top_builddir)/perl-module/pspp-module-config
+--- pspp-1.6.0/perl-module/automake.mk.orig 2022-07-14 22:08:57.941719843
+0200
++++ pspp-1.6.0/perl-module/automake.mk 2022-07-14 22:12:14.743987007 +0200
+@@ -45,7 +45,7 @@ perl-module/Makefile: perl-module/Makefi
+ $(SED) -e "/^INC/s/\([^=]\) *-I/\1\" -I/g" -e "/^INC/s/ *-I */
-I\"/g" -e "/^INC/s/ *$$/\"/" -e "/^MYEXTLIB/s/\([^=]\) \([^=]\)/\1\\\\ \2/g"
$< > $@
- perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
$(module_sources)
+ perl-module/MakefileX: perl-module/Makefile.PL perl-module/pspp-module-config
$(module_sources)
- $(AM_V_GEN)cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) \
+ $(AM_V_GEN)cd perl-module && $(PERL) Makefile.PL INSTALLDIRS=vendor \
- OPTIMIZE="$(CFLAGS)
$(CPPFLAGS)" \
+ OPTIMIZE="$(CFLAGS)
$(CPPFLAGS) -Wno-error" \
LD="`$(PERL) -e 'use
Config::Perl::V;print Config::Perl::V::myconfig()->{config}{ld};'` $(LDFLAGS)"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pspp.git/commitdiff/f0ca7162a5b6c4ff6d66c597de0d2a91bdd13403
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
