release-notes/devel fedora-release-notes.spec,1.30,1.31

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8143

Modified Files:
	fedora-release-notes.spec 
Log Message:
Handle new module contents properly and arrange build process to be less insane to the eye


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fedora-release-notes.spec	19 Mar 2007 22:08:26 -0000	1.30
+++ fedora-release-notes.spec	22 Mar 2007 17:27:31 -0000	1.31
@@ -1,14 +1,16 @@
 Name:		fedora-release-notes
 Version:	6.92
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
 License:	Distributable
 Source0:	fedora-release-notes-%{version}.tar.gz
-#Source1:	indexhtml-head
-#Source2:	indexhtml-foot
+Source1:	homepage-%{version}.tar.gz
+Source2:	about-fedora-%{version}.tar.gz
+Source3:	README-%{version}.tar.gz
+Source4:	README-BURNING-ISOS-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -25,6 +27,10 @@
 
 %prep
 %setup -q
+%setup -D -q -a 1
+%setup -D -q -a 2
+%setup -D -q -a 3
+%setup -D -q -a 4
 
 
 %build
@@ -32,17 +38,14 @@
 #sed 's/.*<div class="article"/<div class="article"/g' \
 #	RELEASE-NOTES-en_US.html >> index.html
 #cat %{SOURCE2} >> index.html
-sed -i 's/@RELEASE@/%{version}/g' about-gnome.desktop
+#sed -i 's/@RELEASE@/%{version}/g' about-gnome.desktop
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 install -m 644 fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 homepage/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
 install -m 644 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-install -m 644 README-BURNING-ISOS*.txt $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 for DIR in css img stylesheet-images ; do
   install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR
   find $DIR -type f -exec install -m 644 {} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR \;
@@ -50,12 +53,21 @@
 for F in RELEASE-NOTES-*.html; do
   install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$F
 done
-find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release-notes-%{version}/{} \;
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
-install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes/
+pushd README-BURNING-ISOS-%{version}/
+install -m 644 README-BURNING-ISOS*.txt $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+popd
+pushd homepage-%{version}
+install -m 644 homepage/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
+popd
+pushd about-fedora-%{version}
+find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/{} \;
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora
 install -m 644 about-*omf $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora/
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
+popd
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
+install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
 
 
 %clean
@@ -74,13 +86,16 @@
 %files
 %defattr(-,root,root,-)
 %{_defaultdocdir}/HTML
-%{_defaultdocdir}/fedora-release-notes-%{version}/about
+%{_defaultdocdir}/fedora-release-notes-%{version}/
 %{_datadir}/applications/about-fedora.desktop
 %{_datadir}/omf/fedora-release-notes/
 %{_datadir}/omf/about-fedora/
 
 
 %changelog
+* Thu Mar 22 2007 Paul W. Frields <stickster at gmail.com> - 6.92-2
+- Use content from all supplemental modules in Docs CVS
+
 * Mon Mar 19 2007 Paul W. Frields <stickster at gmail.com> - 6.92-1
 - Update for Fedora 7 test3