- pl, use default prefix

Changed files:
    RasMol.spec -> 1.2

diff --git a/RasMol.spec b/RasMol.spec
index dcbcfc7d04eb87dea0fd35974f997cce3d637a17..7ca15ab6883810ac42bece21db2d516883e63697 100644 (file)
--- a/RasMol.spec
+++ b/RasMol.spec
@@ -10,39 +10,52 @@ Source0:    ftp://ftp.dcs.ed.ac.uk/pub/rasmol/%{name}.tar.gz
 BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         /usr/X11R6/man
-
 %description
 RasMol2 is a molecular graphics program intended for the visualisation
 of proteins, nucleic acids and small molecules. The program is aimed
 at display, teaching and generation of publication quality images.
 RasMol runs on Microsoft Windows, Apple Macintosh, UNIX and VMS
 systems. The UNIX and VMS systems require an 8, 24 or 32 bit colour X
-Windows display (X11R4 or later). The program reads in a molecule
-co-ordinate file and interactively displays the molecule on the screen
-in a variety of colour schemes and molecule representations. Currently
-available representations include depth-cued wireframes, 'Dreiding'
-sticks, spacefilling (CPK) spheres, ball and stick, solid and strand
-biomolecular ribbons, atom labels and dot surfaces.
+Window System display (X11R4 or later). The program reads in a
+molecule co-ordinate file and interactively displays the molecule on
+the screen in a variety of colour schemes and molecule
+representations. Currently available representations include
+depth-cued wireframes, 'Dreiding' sticks, spacefilling (CPK) spheres,
+ball and stick, solid and strand biomolecular ribbons, atom labels and
+dot surfaces.
 
-#%description -l pl
+%description -l pl
+RasMol2 to program do grafiki molekularnej maj±cy s³u¿yæ do
+wizualizacji bia³ek, kwasów nukleinowych i ma³ych cz±steczek. Celem
+programu jest wy¶wietlanie, nauka i generowanie obrazków o jako¶ci
+nadaj±cej siê do publikacji. RasMol dzia³a na systemach Microsoft
+Windows, Apple Macintosh, UNIX i VMS. Syystemy UNIX i VMS wymagaj± 8,
+24 lub 32-bitowego ekranu systemu X Window (w wersji X11R4 lub
+nowszej). Program czyta plik wspó³rzêdnych cz±steczek i interaktywnie
+wy¶wietla cz±steczkê na ekranie w ró¿nych schematach kolorów i
+reprezentacji. Aktualnie dostêpne reprezentacje obejmuj± model drutowy
+odtwarzaj±cy g³êboko¶æ, cylindryczne pa³±ki (Dreiding), sfery
+wype³niaj±ce przestrzeñ (CPK), kulki i pa³±ki, bry³y i splecione
+wstêgi biomolekularne, etykiety atomów i kropkowane powierzchnie.
 
 %prep
-%setup -q -n RasMol2
+%setup -q -n %{name}
 
 %build
 xmkmf
-%{__make}
+%{__make} \
+       CDEBUGFLAGS="%{rpmcflags}" \
+       RASMOLDIR=%{_libdir}/rasmol
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-install doc/rasmol.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install install.man \
+       DESTDIR=$RPM_BUILD_ROOT \
+       BINDIR=%{_bindir} \
+       MANDIR=%{_mandir}/man1 \
+       RASMOLDIR=%{_libdir}/rasmol
 
 %clean
 rm -rf $RPM_BUILD_ROOT