[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

fedora-release indexhtml-foot, NONE, 1.1 indexhtml-head, NONE, 1.1 Makefile, 1.1, 1.2 fedora-release.spec, 1.11, 1.12 index.html, 1.5, NONE



Author: sopwith

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

Modified Files:
	Makefile fedora-release.spec 
Added Files:
	indexhtml-foot indexhtml-head 
Removed Files:
	index.html 
Log Message:
generate index.html from relnotes on the fly


--- NEW FILE indexhtml-foot ---

		</div></div>
			<div class="fedora-corner-br">&nbsp;</div>
			<div class="fedora-corner-bl">&nbsp;</div>
		</div>
		<!-- content END -->
		
		<!-- footer BEGIN -->
		<div id="fedora-footer">
			Copyright © 2004 Red Hat, Inc. All rights reserved.
			<br>
			Fedora is a trademark of Red Hat, Inc.
			<br>
			The Fedora Project is not a supported product of Red Hat, Inc.
			<br>
			Red Hat, Inc. is not responsible for the content of other sites.
		</div>
		<!-- footer END -->
	</body></html>


--- NEW FILE indexhtml-head ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";><html><head><title>Fedora Project, sponsored by Red Hat</title>
		
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<link rel="stylesheet" type="text/css" media="print" href="css/print.css">
		<style type="text/css" media="screen">
			@import url("css/layout.css");
			@import url("css/content.css");
			@import url("css/docbook.css");
		</style>
		<script src="offsite.js" type="text/javascript"></script>
		<meta name="MSSmartTagsPreventParsing" content="TRUE">
		<link rel="shortcut icon" href="http://fedora.redhat.com/images/favicon.ico";>
		<link rel="icon" href="http://fedora.redhat.com/images/favicon.ico";></head>


	<body onload="OffSite();">
		<!-- header BEGIN -->
		<div id="fedora-header">
			<div id="fedora-header-logo">
				<a href="http://fedora.redhat.com/"; id="link-internal"><img src="img/header-fedora_logo.png" alt="Fedora Project"></a>
			</div>

			<div id="fedora-header-items">
				<span class="fedora-header-icon">
					<a href="http://fedora.redhat.com/download/"; id="link-internal"><img src="img/header-download.png" alt=" ">Download</a>
					<a href="http://fedora.redhat.com/projects/"; id="link-internal"><img src="img/header-projects.png" alt=" ">Projects</a>
					<a href="http://fedora.redhat.com/about/faq/"; id="link-internal"><img src="img/header-faq.png" alt=" ">FAQ</a></span>
			</div>
		</div>

		<div id="fedora-nav"></div>
		<!-- header END -->
		
		<!-- leftside BEGIN -->
		<div id="fedora-side-left">
		<div id="fedora-side-nav-label">Site Navigation:</div>	<ul id="fedora-side-nav">
				<li><a href="http://fedora.redhat.com/"; id="link-internal">Home</a></li>
				<li><a href="http://fedora.redhat.com/download/"; id="link-internal">Download</a></li>
				<li><a href="http://fedora.redhat.com/docs/"; id="link-internal">Docs</a>	<ul>
					<li><strong><a href="http://fedora.redhat.com/docs/release-notes/"; id="link-internal">Release Notes</a></strong></li>
				</ul></li>
				<li><a href="http://fedora.redhat.com/projects/"; id="link-internal">Projects</a></li>
				<li><a href="http://fedora.redhat.com/participate/"; id="link-internal">Participate</a></li>
				<li><a href="http://fedora.redhat.com/about/"; id="link-internal">About</a></li>
			</ul>
		</div>

		<!-- leftside END -->

		<!-- content BEGIN -->
		<div id="fedora-middle-two">
			<div class="fedora-corner-tr">&nbsp;</div>
			<div class="fedora-corner-tl">&nbsp;</div>
			<div id="fedora-content">



Index: Makefile
===================================================================
RCS file: /cvs/fedora/fedora-release/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	4 May 2005 18:45:31 -0000	1.1
+++ Makefile	1 Jun 2005 19:18:12 -0000	1.2
@@ -6,6 +6,12 @@
 
 all:
 
+index.html: RELEASE-NOTES-en.html indexhtml-head indexhtml-foot
+	@head -n-3 $< | \
+	   sed 's|.*<div class="article"|<div class="article"|g ; s|<p class="ackno".*||g' > $  tmp
+	@cat indexhtml-head $  tmp indexhtml-foot > $@
+	@rm -f $  tmp && echo "ok"
+
 tag-archive:
 	@cvs -Q tag -F $(CVSTAG)
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-release.spec	30 May 2005 23:57:58 -0000	1.11
+++ fedora-release.spec	1 Jun 2005 19:18:12 -0000	1.12
@@ -1,5 +1,5 @@
 %define release_version 4
-%define release_name Rawhide
+%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}}
@@ -7,7 +7,7 @@
 Summary: Fedora Core release file
 Name: fedora-release
 Version: %{real_release_version}
-Release: 0
+Release: 1
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
@@ -38,6 +38,7 @@
 cp -af RELEASE-NOTES-en/* $MAINDIR
 popd
 rm -f */*.eps
+make index.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,7 +59,7 @@
 done
 
 mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
-cp -ap figs *.css *.html stylesheet-images \
+cp -ap figs *.css *.html img css stylesheet-images \
   $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
 install -m 644 RELEASE-NOTES-en.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html
 


--- index.html DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]