- use global configuration files if ~/.antiword/* not present

- removed COPYING from doc
- release 2

Changed files:
    antiword.spec -> 1.3

diff --git a/antiword.spec b/antiword.spec
index 9dafd6e425d68d21d3c9b048b88f2cc8b88f5714..ac837f460569a89f99ed9d34fd0bd95fba64c05c 100644 (file)
--- a/antiword.spec
+++ b/antiword.spec
@@ -1,8 +1,8 @@
 Summary:       MSWord Document to TXT/Postscript converter
-Summary(pl):   Konwerter domumentów MSWord do TXT/Postscript
+Summary(pl):   Konwerter dokumentów MSWord do TXT/Postscript
 Name:          antiword
 Version:       0.31
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Text
 Group(de):     Applikationen/Text
@@ -10,6 +10,7 @@ Group(fr):    Utilitaires/Texte
 Group(pl):     Aplikacje/Tekst
 Source0:       http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 Patch0:                %{name}-opt.patch
+Patch1:                %{name}-globalconf.patch
 URL:           http://www.winfield.demon.nl/index.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -19,13 +20,14 @@ converts the documents from Word 6, 7, 97 and 2000 to text and
 Postscript. Antiword tries to keep the layout of the document intact.
 
 %description -l pl
-Antiword to darmowy czytnik dokumentów M$-Word dla Linuxa, BeOS i RISC
-OS. Konwertuje on dokumenty z Worda 6,7, 97 oraz 2000 do tekstu oraz
+Antiword to darmowy czytnik dokumentów MS-Word dla Linuxa, BeOS i RISC
+OS. Konwertuje on dokumenty z Worda 6, 7, 97 oraz 2000 do tekstu oraz
 Postscriptu. Antiword próbuje utrzymaæ formê dokumentu nietkniêt±.
 
 %prep
 %setup -q -n %{name}.%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 OPT="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" %{__make}
@@ -33,13 +35,13 @@ OPT="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" %{__make}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/antiword}
 
 install %{name}                $RPM_BUILD_ROOT%{_bindir}
 install Docs/*.1       $RPM_BUILD_ROOT%{_mandir}/man1
+install Resources/*    $RPM_BUILD_ROOT%{_datadir}/antiword
 
-rm -f Docs/*.1
-mv -f Resources .antiword
+rm -f Docs/{*.1,COPYING}
 
 gzip -9nf Docs/*
 
@@ -48,6 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Docs/*.gz .antiword
+%doc Docs/*.gz
 %attr(755,root,root) %{_bindir}/*
+%{_datadir}/antiword
 %{_mandir}/man*/*