- updated to 0.8.5; -libs subpackage

diff --git a/pspp.spec b/pspp.spec
index 87fbda56a7b4b56d83984f3836a455b7d7705168..52c6db90067c779b6d507afcfd9245fc6ffd694d 100644 (file)
--- a/pspp.spec
+++ b/pspp.spec
@@ -1,12 +1,12 @@
 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:       0.8.4
-Release:       2
+Version:       0.8.5
+Release:       1
 License:       GPL v3+
 Group:         Applications/Science
 Source0:       http://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
-# Source0-md5: 85b7729751ebe427fb71a362b71cdfd9
+# Source0-md5: 7600234a8a968c513a2e5c5dbecfc392
 Patch0:                %{name}-info.patch
 URL:           http://www.gnu.org/software/pspp/
 BuildRequires: cairo-devel >= 1.5
@@ -24,8 +24,8 @@ BuildRequires:        postgresql-devel
 BuildRequires: readline-devel
 BuildRequires: texinfo
 BuildRequires: zlib-devel
+Requires:      %{name}-libs = %{version}
 Requires:      cairo >= 1.5
-Requires:      gsl >= 1.13
 Requires:      gtk+2 >= 2:2.24
 Requires:      gtksourceview2 >= 2.2
 Requires:      pango >= 1:1.22
@@ -41,13 +41,24 @@ GNU PSPP to program do analizy statystycznej danych próbkowanych. Jest
 to wolnodostępny zamiennik własnościowego programu SPSS; jest do niego
 dosyć podobny z kilkoma wyjątkami.
 
+%package libs
+Summary:       GNU PSPP libraries and command line tools 
+Group:         Applications/Science
+Requires:      gsl >= 1.13
+
+%description libs
+GNU PSP libraries command line tools 
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %configure \
-       --disable-static
+       --disable-static \
+       --with-openssl \
+       --with-packager="PLD Linux (http://pld-linux.org)"
+
 %{__make}
 
 %install
@@ -66,14 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/pspp
-%attr(755,root,root) %{_bindir}/pspp-convert
-%attr(755,root,root) %{_bindir}/pspp-dump-sav
 %attr(755,root,root) %{_bindir}/psppire
-%dir %{_libdir}/pspp
-%attr(755,root,root) %{_libdir}/pspp/libpspp-%{version}.so
-%attr(755,root,root) %{_libdir}/pspp/libpspp-core-%{version}.so
 %{_datadir}/pspp
 %{_datadir}/appdata/pspp.appdata.xml
 %{_desktopdir}/pspp.desktop
@@ -81,5 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/mimetypes/application-x-spss-*.png
 %{_infodir}/pspp.info*
 %{_infodir}/pspp-dev.info*
+%{_mandir}/man1/pspp.1*
+%{_mandir}/man1/psppire.1*
+
+%files libs
+%attr(755,root,root) %{_bindir}/pspp-convert
+%attr(755,root,root) %{_bindir}/pspp-dump-sav
+%dir %{_libdir}/pspp
+%attr(755,root,root) %{_libdir}/pspp/libpspp-%{version}.so
+%attr(755,root,root) %{_libdir}/pspp/libpspp-core-%{version}.so
 %{_mandir}/man1/pspp-convert.1*
 %{_mandir}/man1/pspp-dump-sav.1*
+%doc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO