- expanded %ftppath for ./pldnotify to work,

- removed english de summary, fixed pl one,
- fixed typos in pl description,
- BR: bison,
- upgraded to 4.2:
 - updated patches,
 - more common build process,
 - get rid of [...]/pc_linux directory and it's symlinks,
 - added man pages, Manual.ps and tools' docs.

Changed files:
    SNNS.spec -> 1.7

diff --git a/SNNS.spec b/SNNS.spec
index 83239c1094a8a65f9a54ff605d523476f94946a2..bb6375159149d505bffc7c475d2d3b5deb9a906c 100644 (file)
--- a/SNNS.spec
+++ b/SNNS.spec
@@ -1,23 +1,22 @@
 
-%define ftppath ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS
-
 Summary:       Stuttgart Neural Network Simulator
-Summary(de):   Stuttgart Neural Network Simulator
-Summary(pl):   Stuttgart Neural Network Simulator
+Summary(pl):   Sztutgardzki symulator sieci neuronowych
 Name:          SNNS
-Version:       4.1
-Release:       0.1
+Version:       4.2
+Release:       1
 License:       Free Software
 Group:         X11/Applications
-Source0:       %{ftppath}/%{name}v%{version}.tar.gz
-# Source0-md5: 6385faf45eec7bfba67d7024c31d1ac0
-Source2:       %{ftppath}/%{name}v%{version}.Manual.ps.gz
-# Source2-md5: 09431050aa7c3c77f55751566149c853
-#Source3:      %{ftppath}/%{name}info-1.03.tar.gz
+Source0:       ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/%{name}v%{version}.tar.gz
+# Source0-md5: 4609dfd61714bfbb0842d4e8e905e584
+Source2:       ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/%{name}v%{version}.Manual.ps.gz
+# Source2-md5: 1df5e14726c88d01be9f67e4590600a9
+#Source3:      ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/%{name}info-1.03.tar.gz
 # Source3-md5: c2a99f0294bd02e5f3bfdff6bf16469a
-Patch1:                %{name}-config.diff
+Patch0:                %{name}-include.patch
+Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-XGUILOADPATH.diff
 Patch3:                %{name}-inc_fix.patch
+BuildRequires: bison
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,8 +28,8 @@ SNNS (Stuttgart Neural Network Simulator) ist ein Simulationsprogramm
 für Neuronal Netzwerk.
 
 %description -l pl
-SNNS (Stuttgar Neural Network Simulator) jest symulatorem sieci
-neuronwych.
+SNNS (Stuttgart Neural Network Simulator) jest symulatorem sieci
+neuronowych.
 
 %package doc
 Summary:       SNNS-Dokomentationen
@@ -48,40 +47,29 @@ Ten pakiet zawiera dokumentacje w HTMLu i postscripcie.
 
 %prep
 %setup -q -n %{name}v%{version}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 %build
-%{__make} -C kernel/sources
-%{__make} -C tools/sources
-%{__make} -C xgui/sources
+%configure2_13 \
+       --enable-global
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/SNNS/{kernel,tools,xgui}/bin/pc_linux \
-$RPM_BUILD_ROOT%{_prefix}/{bin,lib/SNNS/examples}
-
-%{__make} -C kernel/sources install \
-               DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_mandir}/man1}
 
-%{__make} -C xgui/sources install \
+%{__make} install \
                DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C tools/sources install \
-               DESTDIR=$RPM_BUILD_ROOT
-
-cp -af help.hdoc default.cfg examples $RPM_BUILD_ROOT%{_libdir}/SNNS
-
-ln -fs ../../lib/SNNS/xgui/bin/pc_linux/xgui \
-$RPM_BUILD_ROOT%{_prefix}/bin/xgui
-
-cd $RPM_BUILD_ROOT%{_libdir}/SNNS/tools/bin/pc_linux
-for n in *; do
-ln -fs ../../lib/SNNS/tools/bin/pc_linux/$n $RPM_BUILD_ROOT%{_prefix}/bin/$n
-done
+cp -af help.hdoc default.cfg examples $RPM_BUILD_ROOT%{_libdir}/%{name}
+install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE2} .
+gunzip %{name}v%{version}.Manual.ps.gz
 
-cd $RPM_BUILD_ROOT%{_prefix}/bin
+cd $RPM_BUILD_ROOT%{_bindir}
 ln -fs xgui snns
 
 #cd $RPM_BUILD_ROOT%{_libdir}/SNNS
@@ -95,12 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Readme*
-%config %{_libdir}/SNNS/default.cfg
-%{_libdir}/SNNS/help.hdoc
+%doc Readme* tools/doc/* %{name}v%{version}.Manual.ps
+%config %{_libdir}/%{name}/default.cfg
+%{_libdir}/%{name}/help.hdoc
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/SNNS/*/bin/pc_linux/*
-%attr(755,root,root) %{_libdir}/SNNS/examples
+%attr(755,root,root) %{_libdir}/%{name}/examples
+%{_mandir}/man1/*
 
 #%files doc
 #%defattr(644,root,root,755)