- further cleanups, pl

Changed files:
    axiom.spec -> 1.3

diff --git a/axiom.spec b/axiom.spec
index 5b502eccafb1ea556abc4efc87a729fe5aaffafe..a60787cb9f688444e2e8d30224afd27cfd95cf82 100644 (file)
--- a/axiom.spec
+++ b/axiom.spec
@@ -1,22 +1,34 @@
-%define NO_REGRESSION_TEST 1
-
+#
+# Conditional build:
+%bcond_with    tests   # perform regression test
+#
 %define snap 20040509
-
-Name:          axiom
-Version:       3.%axiom_cvs_date
-Release:       alt1
 Summary:       Axiom Computer Algebra System
-Summary(ru_RU.UTF-8):Система аналитических вычислений Axiom
+Summary(pl):   System algebry komputerowej Axiom
+Summary(ru_RU.UTF-8):  Система аналитических вычислений Axiom
+Name:          axiom
+Version:       3.%{snap}
+Release:       1
 License:       Modified BSD License
 Group:         Applications/Science
-Url:           http://savannah.nongnu.org/projects/axiom
 Source0:       %{name}-cvs-%{snap}.tar.bz2
 Source1:       %{name}
 Source2:       gcl-2.6.2-%{name}.tar.gz
 Patch1:                %{name}-no-test.patch
 Patch2:                %{name}-external-gcl.patch
-BuildRequires: libreadline-devel libncurses-devel tcl-devel tk-devel libiberty-devel libbfd-devel-static xpm-devel XFree86-devel
-BuildRequires: tetex tetex-latex tetex-dvips texinfo lynx sed gawk coreutils diffutils
+URL:           http://savannah.nongnu.org/projects/axiom/
+BuildRequires: XFree86-devel
+BuildRequires  gawk
+BuildRequires: lynx
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
+BuildRequires: tcl-devel
+BuildRequires: tetex
+BuildRequires: tetex-dvips
+BuildRequires: tetex-latex
+BuildRequires: texinfo
+BuildRequires: tk-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Axiom is a general purpose Computer Algebra system. It is useful for
@@ -34,6 +46,21 @@ rebuild the algebra in a literate programming style (f) integrate
 logic programming (g) develop an Axiom Journal with refereed
 submissions.
 
+%description -l pl
+Axiom to system algebry komputerowej ogólnego przeznaczenia. Jest
+przydatny przy badaniach i rozwoju algorytmów matematycznych.
+Definiuje silnie typowan±, poprawn± matematycznie hierarchiê typów. Ma
+jêzyk programowania i wbudowany kompilator.
+
+Axiom jest rozwijany od 1973 i by³ sprzedawany jako produkt
+komercyjny. Zosta³ wypuszczony jako darmowe oprogramowanie.
+
+S± czynione starania rozszerzenia tego oprogramowania, aby: stworzyæ
+lepszy interfejs u¿ytkownika, uczyniæ je przydatne jako narzêdzie do
+nauczania, stworzyæ protokó³ serwera algebry, zintegrowaæ dodatkow±
+matematykê, przebudowaæ algebrê w czytelnym stylu programowania,
+zintegrowaæ programowanie logiczne, stworzyæ Axiom Journal.
+
 %description -l ru_RU.UTF-8
 Axiom является универсальной системой
 аналитических вычислений и может
@@ -52,29 +79,32 @@ Axiom развивается с 1973 года и ранее
 свободной програмной лицензией.
 
 %package doc
-Summary:       Axiom Book and other Documentaion
-Summary (ru_RU.UTF-8):Книга и другая документация по Axiom
+Summary:       Axiom Book and other documentaion
+Summary(pl):   Axiom Book i inna dokumentacja
+Summary(ru_RU.UTF-8):  Книга и другая документация по Axiom
 Group:         Applications/Science
 
 %description doc
 Axiom Book and other Documentaion.
 
+%description doc -l pl
+Axiom Book i inna dokumentacja.
+
 %description doc -l ru_RU.UTF-8
 Книга и другая документация по Axiom.
 
 %prep
-%setup -q -n %name
-
-%if %NO_REGRESSION_TEST
+%setup -q -n %{name}
+%if !%{with tests}
 %patch1 -p1
 %endif
 
-cp %SOURCE2 zips/gcl-2.6.2a.tgz
+cp %{SOURCE2} zips/gcl-2.6.2a.tgz
 
 #%patch2 -p1
 
 %build
-export AXIOM=%_builddir/%name/mnt/linux
+export AXIOM=%{_builddir}/%{name}/mnt/linux
 export PATH=$AXIOM/bin:$PATH
 
 %{__make}
@@ -82,32 +112,37 @@ cd mnt/linux/doc
 dvips -o book.ps book.dvi
 dvips -o Rosetta.ps Rosetta.dvi
 dvips -o DeveloperNotes.ps DeveloperNotes.dvi
-cd ../../..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d %buildroot%_bindir
+install -d $RPM_BUILD_ROOT%{_bindir}
 
-%{__make} INSTALL=%buildroot%_libdir/%name COMMAND=%buildroot%_bindir/%name install
+%{__make} install \
+       INSTALL=$RPM_BUILD_ROOT%{_libdir}/%{name} \
+       COMMAND=$RPM_BUILD_ROOT%{_bindir}/%{name}
 
-install -D -m755 %SOURCE1 %buildroot%_bindir/%name
+install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%_bindir/%name
-%_libdir/%name/mnt/linux/algebra
-%_libdir/%name/mnt/linux/autoload
-%_libdir/%name/mnt/linux/bin
-%_libdir/%name/mnt/linux/input
-%_libdir/%name/mnt/linux/lib
-%_libdir/%name/mnt/linux/src
-%_libdir/%name/mnt/linux/timestamp
-%_libdir/%name/mnt/linux/doc/hypertex
-%_libdir/%name/mnt/linux/doc/msgs
+%attr(755,root,root) %{_bindir}/%{name}
+%dir%{_libdir}/%{name}
+%dir%{_libdir}/%{name}/mnt
+%dir%{_libdir}/%{name}/mnt/linux
+%{_libdir}/%{name}/mnt/linux/algebra
+%{_libdir}/%{name}/mnt/linux/autoload
+%{_libdir}/%{name}/mnt/linux/bin
+%{_libdir}/%{name}/mnt/linux/input
+%{_libdir}/%{name}/mnt/linux/lib
+%{_libdir}/%{name}/mnt/linux/src
+%{_libdir}/%{name}/mnt/linux/timestamp
+%dir%{_libdir}/%{name}/mnt/linux/doc
+%{_libdir}/%{name}/mnt/linux/doc/hypertex
+%{_libdir}/%{name}/mnt/linux/doc/msgs
 
 %files doc
 %defattr(644,root,root,755)
-%doc %_libdir/%name/mnt/linux/doc/*.ps
+%doc %{_libdir}/%{name}/mnt/linux/doc/*.ps