fedora-release fedora-release.spec, 1.9, 1.10 README-i386-en, 1.4, NONE README-ppc-en, 1.4, NONE README-x86_64-en, 1.4, NONE RELEASE-NOTES-i386-en, 1.4, NONE RELEASE-NOTES-ppc-en, 1.4, NONE RELEASE-NOTES-x86_64-en, 1.4, NONE

[Elliot Lee (sopwith)]

Author: sopwith

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32205

Modified Files:
	fedora-release.spec 
Removed Files:
	README-i386-en README-ppc-en README-x86_64-en 
	RELEASE-NOTES-i386-en RELEASE-NOTES-ppc-en 
	RELEASE-NOTES-x86_64-en 
Log Message:
sync


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-release.spec	25 May 2005 09:05:53 -0000	1.9
+++ fedora-release.spec	30 May 2005 22:53:20 -0000	1.10
@@ -1,5 +1,5 @@
 %define release_version 4
-%define release_name FC4
+%define release_name Lincoln
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide
 %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}}
@@ -11,6 +11,7 @@
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
+Source1: fedora-release-notes-%{real_release_version}.tar.gz
 Obsoletes: rawhide-release
 Obsoletes: redhat-release
 Obsoletes: indexhtml
@@ -18,15 +19,23 @@
 Provides: indexhtml
 BuildRoot: %{_tmppath}/fedora-release-root
 ExclusiveArch: i386 x86_64 ppc
+BuildRequires: xmlto
 
 %description
 Fedora Core release file
 
 %prep
-%setup -q -n fedora-release-%{version}
+%setup -q -n fedora-release-%{version} -a 1
 
 %build
 python -c "import py_compile; py_compile.compile('eula.py')"
+make -C release-notes/FC4
+MAINDIR=`pwd`
+pushd release-notes/FC4
+cp RELEASE-NOTES-en.txt $MAINDIR
+cp -af README-en/* $MAINDIR
+cp -af RELEASE-NOTES-en/* $MAINDIR
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,24 +50,22 @@
 cp -f eula.txt $RPM_BUILD_ROOT/usr/share/eula/eula.en_US
 cp -f eula.py $RPM_BUILD_ROOT/usr/share/firstboot/modules/eula.py
 
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+for file in RPM-GPG-KEY* ; do
+	install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+done
+
 mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
-cp -ap img css \
+cp -ap figs *.css *.html stylesheet-images \
   $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
-install -m 644 index.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html
+install -m 644 RELEASE-NOTES-en.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html
 
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/sysconfig/rhn
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 sources $RPM_BUILD_ROOT/etc/sysconfig/rhn/sources
 for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
-for file in RPM-GPG-KEY* ; do
-  install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-done
-
-
-ln -s fedora-release-%{version} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,14 +89,13 @@
 /etc/redhat-release
 %dir /etc/sysconfig/rhn
 %dir /etc/yum.repos.d
-%dir /etc/pki/rpm-gpg
 %config(noreplace) /etc/sysconfig/rhn/sources
 %config(noreplace) /etc/yum.repos.d/*
-/etc/pki/rpm-gpg/*
+%doc R*
 %doc eula.txt GPL autorun-template
 %config %attr(0644,root,root) /etc/issue
 %config %attr(0644,root,root) /etc/issue.net
 /usr/share/firstboot/modules/eula.py
 /usr/share/eula/eula.en_US
 %{_defaultdocdir}/HTML
-%{_defaultdocdir}/fedora-release
+/etc/pki/rpm-gpg/*


--- README-i386-en DELETED ---


--- README-ppc-en DELETED ---


--- README-x86_64-en DELETED ---


--- RELEASE-NOTES-i386-en DELETED ---


--- RELEASE-NOTES-ppc-en DELETED ---


--- RELEASE-NOTES-x86_64-en DELETED ---