From fda565f31ac4451d5438aa50d027ffa206e285ef Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Apr 15 2012 08:40:16 +0000 Subject: Ver. 0.7.9 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 4d41883..b09427f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ pspp.svg pspp-0.6.2.tar.gz /pspp-0.6.2.tar.gz /pspp-0.7.8.tar.gz +/pspp-0.7.9.tar.gz diff --git a/pspp-0.7.8.tar.gz.sig b/pspp-0.7.8.tar.gz.sig deleted file mode 100644 index 9aa85fc..0000000 Binary files a/pspp-0.7.8.tar.gz.sig and /dev/null differ diff --git a/pspp-0.7.9.tar.gz.sig b/pspp-0.7.9.tar.gz.sig new file mode 100644 index 0000000..5b9a053 Binary files /dev/null and b/pspp-0.7.9.tar.gz.sig differ diff --git a/pspp-0001-Fix-DSO-linking-issue.patch b/pspp-0001-Fix-DSO-linking-issue.patch index ca4b024..06b87e8 100644 --- a/pspp-0001-Fix-DSO-linking-issue.patch +++ b/pspp-0001-Fix-DSO-linking-issue.patch @@ -1,28 +1,28 @@ -From 7d69b0bbd195a114ba363a2f6b3b46d62cd7edfc Mon Sep 17 00:00:00 2001 +From e3756910e9f1fd651d3259b6504b2706a57198dc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov -Date: Sat, 17 Dec 2011 21:16:01 +0400 +Date: Sat, 17 Dec 2011 21:05:27 +0400 Subject: [PATCH 1/1] Fix DSO linking issue Signed-off-by: Peter Lemenkov --- src/ui/gui/automake.mk | 1 + src/ui/terminal/automake.mk | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 files changed, 2 insertions(+) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk -index 8cefb9d..41b5e11 100644 +index 770a5a9..969d730 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk -@@ -65,6 +65,7 @@ src_ui_gui_psppire_LDADD = \ +@@ -71,6 +71,7 @@ src_ui_gui_psppire_LDADD = \ src/ui/libuicommon.la \ src/libpspp.la \ src/libpspp-core.la \ + $(GSL_LIBS) \ $(GTK_LIBS) \ + $(GTKSOURCEVIEW_LIBS) \ $(CAIRO_LIBS) \ - $(LIBICONV) \ diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk -index 3fa72c4..9051ff9 100644 +index 7bf2e6f..82f9ef8 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -23,6 +23,7 @@ src_ui_terminal_pspp_LDADD = \ @@ -31,8 +31,8 @@ index 3fa72c4..9051ff9 100644 $(CAIRO_LIBS) \ + $(GSL_LIBS) \ $(NCURSES_LIBS) \ - $(LIBICONV) \ - $(LIBINTL) $(LIBREADLINE) + $(LIBREADLINE) \ + $(GSL_LIBS) -- -1.7.7.3 +1.7.9.3 diff --git a/pspp.spec b/pspp.spec index deb20c7..2295d67 100644 --- a/pspp.spec +++ b/pspp.spec @@ -1,6 +1,6 @@ Name: pspp -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.7.9 +Release: 1%{?dist} Summary: A program for statistical analysis of sampled data Group: Applications/Engineering License: GPLv3+ @@ -17,6 +17,7 @@ BuildRequires: glade3-libgladeui-devel, libglade2-devel BuildRequires: gettext, desktop-file-utils BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: autoconf automake libtool gettext-devel texinfo libxml2 +BuildRequires: gtksourceview2-devel Requires: hicolor-icon-theme Requires(post): info Requires(preun): info @@ -70,8 +71,8 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/pspp.desktop # 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 +#rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspp.so +#rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspp-core.so %check @@ -106,18 +107,23 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS ONEWS README THANKS examples/ +%doc AUTHORS COPYING NEWS ONEWS README THANKS %{_bindir}/pspp %{_bindir}/psppire +%{_bindir}/pspp-dump-sav %{_infodir}/pspp* -%{_libdir}/libpspp-0.7.8.so -%{_libdir}/libpspp-core-0.7.8.so -%{_datadir}/pspp +%{_libdir}/%{name}/ +%{_mandir}/man1/pspp-dump-sav.* %{_datadir}/applications/pspp.desktop -%{_datadir}/icons/hicolor/16x16/apps/psppicon.png +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/16x16/%{name}/ +%{_datadir}/pspp/ %changelog +* Sun Apr 15 2012 Peter Lemenkov - 0.7.9-1 +- Ver. 0.7.9 + * Sat Jan 14 2012 Fedora Release Engineering - 0.7.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index d7adec4..622490f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ec57ffc6c916fd15a80aaa710d08be9 pspp-0.7.8.tar.gz +c0d9c862449744a098a3c5774e7c7c2b pspp-0.7.9.tar.gz