- make build work, drop non-cvs changelog

Changed files:
    faq.spec -> 1.14

diff --git a/faq.spec b/faq.spec
index 2da31e38083999a6a304ecc6fb9d9315783da445..14f604e8662d3f479bb836241dbaacf15112aa01 100644 (file)
--- a/faq.spec
+++ b/faq.spec
@@ -7,8 +7,8 @@ Source0:        ftp://sunsite.unc.edu/pub/Linux/docs/%{name}s-%{version}.tar.gz
 # Source0-md5: 9d036492928ab1d65192738beff5812c
 License:       distributable
 Group:         Documentation
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The faq package includes the text of the Frequently Asked Questions
@@ -28,7 +28,7 @@ Nale
 systemu Linux.
 
 %prep
-%setup -q -n faqs
+%setup -q -n %{name}s
 
 %build
 # kill a dangling symlink
@@ -37,25 +37,25 @@ mv -f Threads-FAQ/Threads-FAQ-html.tar.gz Threads-FAQ/Threads-FAQ.html.tar.gz
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ/{txt,html,ps}
-for faq in *FAQ ; do
-  if [ -d $faq ] ; then
-    [ -f $faq/$faq ] && cp $faq/$faq $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ/txt
-    [ -f $faq/$faq.html.tar.gz ] && tar xzvf $faq/$faq.html.tar.gz -C $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ/html
-    [ -f $faq/$faq.ps.gz ] && rm -f $faq/$faq.ps.gz
-  else
-    cp $faq $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ
-  fi
+install -d $RPM_BUILD_ROOT%{_docdir}/FAQ/{txt,html,ps}
+for faq in *FAQ; do
+       if [ -d $faq ]; then
+               if [ -f $faq/$faq ]; then cp $faq/$faq $RPM_BUILD_ROOT%{_docdir}/FAQ/txt; fi
+               if [ -f $faq/$faq.html.tar.gz ]; then tar xzvf $faq/$faq.html.tar.gz -C $RPM_BUILD_ROOT%{_docdir}/FAQ/html; fi
+               if [ -f $faq/$faq.ps.gz ]; then rm -f $faq/$faq.ps.gz; fi
+       else
+               cp $faq $RPM_BUILD_ROOT%{_docdir}/FAQ
+       fi
 done
 
-gzip -9nf $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ/*FAQ \
-       $RPM_BUILD_ROOT%{_defaultdocdir}/FAQ/txt/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/FAQ/*FAQ \
+       $RPM_BUILD_ROOT%{_docdir}/FAQ/txt/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%docdir %{_defaultdocdir}/FAQ
-%dir %{_defaultdocdir}/FAQ
-%{_defaultdocdir}/FAQ/*
+%docdir %{_docdir}/FAQ
+%dir %{_docdir}/FAQ
+%{_docdir}/FAQ/*