commit e6d9fa0a19b6720b77973b00fec37e509d2c6005
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 4 20:53:24 2020 +0200
- updated to 1.4.1; glade module is broken in this version
pspp-glade.patch | 9 ---------
pspp.spec | 13 +++++++------
2 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/pspp.spec b/pspp.spec
index b5c7193..b8d600c 100644
--- a/pspp.spec
+++ b/pspp.spec
@@ -1,25 +1,24 @@
#
# Conditional build:
-%bcond_without glade # Glade extensions for PSPP development
+%bcond_with glade # Glade extensions for PSPP development (broken in
1.4.1)
%bcond_without perl # Perl module
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.0
+Version: 1.4.1
Release: 1
License: GPL v3+
Group: Applications/Science
Source0: https://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
-# Source0-md5: 76ce7964fd0ce3191823a2ca3544772a
+# Source0-md5: 7852af2e4f5ac1b57bd2c1636dca7b40
Patch0: %{name}-info.patch
Patch1: %{name}-perl.patch
-Patch2: %{name}-glade.patch
URL: http://www.gnu.org/software/pspp/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.10.1
BuildRequires: cairo-devel >= 1.5
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.20
BuildRequires: glib2-devel >= 1:2.44
BuildRequires: gsl-devel >= 1.13
BuildRequires: gtk+3-devel >= 3.22.0
@@ -49,6 +48,9 @@ Requires: gtksourceview3 >= 3.4.2
Requires: pango >= 1:1.22
Requires: shared-mime-info
Requires: spread-sheet-widget >= 0.6
+%if %{without glade}
+Obsoletes: pspp-glade < 1.4.1
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -104,7 +106,6 @@ Rozszerzenia Glade do rozwijania PSPP.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/pspp-glade.patch b/pspp-glade.patch
deleted file mode 100644
index e902c5d..0000000
--- a/pspp-glade.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- pspp-1.0.1/glade/automake.mk.orig 2017-07-30 02:24:53.000000000 +0200
-+++ pspp-1.0.1/glade/automake.mk 2017-12-02 13:50:20.913402469 +0100
-@@ -67,4 +67,5 @@
- libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
- $(GTKSOURCEVIEW_CFLAGS) -I $(top_srcdir)/src/ui/gui -DDEBUGGING
-
--libglade_psppire_la_LIBADD = gl/libgl.la
-+libglade_psppire_la_LIBADD = gl/libgl.la $(GLADE_UI_LIBS)
-+libglade_psppire_la_LDFLAGS = -avoid-version
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pspp.git/commitdiff/e6d9fa0a19b6720b77973b00fec37e509d2c6005
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
