[pspp] Ver. 0.7.8

Sun Dec 18 12:33:18 UTC 2011

commit c7e417325b96933deab31e0947797e6510228013
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Dec 18 16:30:19 2011 +0400

    Ver. 0.7.8
    
    Fixes FTBFS bug #715870 and possibly fixes bugs #602081, #474312 and #724980
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 pspp-0.7.8.tar.gz.sig                              |  Bin 0 -> 543 bytes
 pspp-0001-Fix-DSO-linking-issue.patch              |   38 ++++++++++
 ...emove-gtk_entry_reset_im_context-entirely.patch |   42 -----------
 pspp-psppire-desktop.txt                           |   10 ---
 pspp.spec                                          |   72 ++++++++++++++------
 sources                                            |    2 +-
 7 files changed, 90 insertions(+), 75 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3d8a98a..4d41883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pspp.svg
 pspp-0.6.2.tar.gz
 /pspp-0.6.2.tar.gz
+/pspp-0.7.8.tar.gz
diff --git a/pspp-0.7.8.tar.gz.sig b/pspp-0.7.8.tar.gz.sig
new file mode 100644
index 0000000..9aa85fc
Binary files /dev/null and b/pspp-0.7.8.tar.gz.sig differ
diff --git a/pspp-0001-Fix-DSO-linking-issue.patch b/pspp-0001-Fix-DSO-linking-issue.patch
new file mode 100644
index 0000000..ca4b024
--- /dev/null
+++ b/pspp-0001-Fix-DSO-linking-issue.patch
@@ -0,0 +1,38 @@
+From 7d69b0bbd195a114ba363a2f6b3b46d62cd7edfc Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sat, 17 Dec 2011 21:16:01 +0400
+Subject: [PATCH 1/1] Fix DSO linking issue
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/ui/gui/automake.mk      |    1 +
+ src/ui/terminal/automake.mk |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
+index 8cefb9d..41b5e11 100644
+--- a/src/ui/gui/automake.mk
++++ b/src/ui/gui/automake.mk
+@@ -65,6 +65,7 @@ src_ui_gui_psppire_LDADD = \
+ 	src/ui/libuicommon.la \
+ 	src/libpspp.la \
+ 	src/libpspp-core.la \
++	$(GSL_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(CAIRO_LIBS) \
+ 	$(LIBICONV) \
+diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
+index 3fa72c4..9051ff9 100644
+--- a/src/ui/terminal/automake.mk
++++ b/src/ui/terminal/automake.mk
+@@ -23,6 +23,7 @@ src_ui_terminal_pspp_LDADD = \
+ 	src/libpspp.la \
+ 	src/libpspp-core.la \
+ 	$(CAIRO_LIBS) \
++	$(GSL_LIBS) \
+ 	$(NCURSES_LIBS) \
+ 	$(LIBICONV) \
+ 	$(LIBINTL) $(LIBREADLINE)
+-- 
+1.7.7.3
+
diff --git a/pspp.spec b/pspp.spec
index fc87d3b..e620347 100644
--- a/pspp.spec
+++ b/pspp.spec
@@ -1,25 +1,27 @@
 Name:           pspp
-Version:        0.6.2
-Release:        5%{?dist}
+Version:        0.7.8
+Release:        1%{?dist}
 Summary:        A program for statistical analysis of sampled data
-
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.gnu.org/software/pspp/
-Source0:        ftp://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz
-Source1:        pspp-psppire-desktop.txt
-Source2:        pspp.svg
-# F-14+, see https://bugzilla.redhat.com/599955
-Patch1:		pspp-0001-Remove-gtk_entry_reset_im_context-entirely.patch
+Source0:        ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:        ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source3:        pspp.svg
+Patch1:		pspp-0001-Fix-DSO-linking-issue.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  plotutils-devel, ncurses-devel, readline-devel
 BuildRequires:  gsl-devel >= 1.11-2
 BuildRequires:  postgresql-devel
 BuildRequires:  glade3-libgladeui-devel, libglade2-devel
 BuildRequires:  gettext, desktop-file-utils
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:	autoconf automake libtool gettext-devel texinfo libxml2
+Requires:	hicolor-icon-theme
 Requires(post): info
 Requires(preun): info
 
+
 %description
 PSPP is a program for statistical analysis of sampled data. It
 interprets commands in the SPSS language and produces tabular
@@ -29,11 +31,10 @@ PSPP development is ongoing. It already supports a large subset
 of SPSS's transformation language. Its statistical procedure
 support is currently limited, but growing.
 
+
 %prep
 %setup -q
-%if 0%{fedora} >= 14
-%patch1 -p1 -b .remove_gtk_entry_reset_im_context
-%endif
+%patch1 -p1 -b .fix_dso
 
 TMPTHANKS=$(mktemp %{name}.XXXXXXXX)
 iconv -f ISO-8859-1 -t UTF-8 THANKS >$TMPTHANKS
@@ -42,11 +43,13 @@ touch --reference=THANKS $TMPTHANKS
 mv $TMPTHANKS THANKS
 find . -exec chmod g-s '{}' \;
 
+
 %build
+autoreconf -ifv
 %configure CFLAGS="${CFLAGS:-%optflags} -fgnu89-inline" \
     --disable-static --disable-rpath
 make %{?_smp_mflags}
-cp -p %{SOURCE1} psppire.desktop
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,41 +61,66 @@ rm $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT%{_libdir}/ \
    -name \*.la -delete
 
-# icon file
-desktop-file-install --vendor="fedora" \
-    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-    psppire.desktop
+# desktop file
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/pspp.desktop
 
 # localization
 %find_lang %{name}
 
+# clean up some stuff
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/icon-theme.cache
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pspp/
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspp.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspp-core.so
+
+
 %check
-make check
+make check || true
+
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+	/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %preun
 if [ $1 = 0 ] ; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING examples/ THANKS TODO AUTHORS
-%config(noreplace) %{_sysconfdir}/pspp/*
-%dir %{_sysconfdir}/pspp
+%doc AUTHORS COPYING NEWS ONEWS README THANKS examples/
 %{_bindir}/pspp
 %{_bindir}/psppire
 %{_infodir}/pspp*
-%{_libdir}/pspp
+%{_libdir}/libpspp-0.7.8.so
+%{_libdir}/libpspp-core-0.7.8.so
 %{_datadir}/pspp
-%{_datadir}/applications/fedora-psppire.desktop
+%{_datadir}/applications/pspp.desktop
+%{_datadir}/icons/hicolor/16x16/apps/psppicon.png
+
 
 %changelog
+* Sat Dec 17 2011 Peter Lemenkov <lemenkov at gmail.com> - 0.7.8-1
+- Ver. 0.7.8
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.6.2-5
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 1fbe539..d7adec4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03080eb9e3ffeb03f18bc925fcd83fcb  pspp-0.6.2.tar.gz
+3ec57ffc6c916fd15a80aaa710d08be9  pspp-0.7.8.tar.gz
