SPECS: faq.spec - make build work, drop non-cvs changelog

[glen]

Author: glen                         Date: Sat Sep  2 20:44:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make build work, drop non-cvs changelog

---- Files affected:
SPECS:
   faq.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/faq.spec
diff -u SPECS/faq.spec:1.13 SPECS/faq.spec:1.14
--- SPECS/faq.spec:1.13	Wed May 28 14:58:55 2003
+++ SPECS/faq.spec	Sat Sep  2 22:44:28 2006
@@ -8,8 +8,8 @@
 # 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
@@ -29,7 +29,7 @@
 systemu Linux.
 
 %prep
-%setup -q -n faqs
+%setup -q -n %{name}s
 
 %build
 # kill a dangling symlink
@@ -38,28 +38,28 @@
 
 %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/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/09/02 20:44:28  glen
+- make build work, drop non-cvs changelog
+
 Revision 1.13  2003/05/28 12:58:55  malekith
 - massive attack: source-md5
 
@@ -74,7 +77,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.11  2002/04/25 16:17:16  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.10  2002/02/23 01:58:11  kloczek
 - adapterized.
@@ -84,7 +87,7 @@
   Group field using gettext).
 
 Revision 1.8  2002/01/18 02:12:51  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.7  2001/11/22 10:48:43  qboosh
 - s/Copyright/License/, adapterized, pl summary
@@ -108,42 +111,4 @@
 - spec cleanup for PLD
 
 Revision 1.1  1999/08/19 20:07:26  baggins
-almost raw
-
-* Fri Apr 09 1999 Preston Brown <pbrown at redhat.com>
-- latest FAQs from metalab.unc.edu
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
-- auto rebuild in the new build environment (release 4)
-
-* Wed Jan 06 1999 Cristian Gafton <gafton at redhat.com>
-- rebuilt for 6.0
-
-* Tue Sep 22 1998 Cristian Gafton <gafton at redhat.com>
-- updated sources
-
-* Thu May 07 1998 Cristian Gafton <gafton at redhat.com>
-- text versions moved under txt dir, so they don't conflict anymore with the
-  packages from the 5.0 dist
-
-* Thu May 07 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Thu May 07 1998 Erik Troan <ewt at redhat.com>
-- changed /usr/doc/FAQ/Linux-FAQ to be directory to match old incarnations
-  of the faq package
-
-* Fri May 01 1998 Donnie Barnes <djb at redhat.com>
-- added /usr/doc/FAQ as a directory to the file list
-
-* Thu Apr 09 1998 Cristian Gafton <gafton at redhat.com>
-- updated; spec file should now be smarter
-- use buildroot
-
-* Mon Oct 20 1997 Otto Hammersmith <otto at redhat.com>
-- updated the faqs
-- use install-info
-
-* Thu Jul 31 1997 Erik Troan <ewt at redhat.com>
-- made a noarch package
-
+- almost raw
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/faq.spec?r1=1.13&r2=1.14&f=u