5 commits - en_US/fedora-release-notes.omf.in fedora-release-notes.spec po/sv.po share/fedora-release-notes.omf.in

Paul W. Frields pfrields at fedoraproject.org
Wed Oct 29 05:27:01 UTC 2008 

 en_US/fedora-release-notes.omf.in |   35 +++++++++++++++++++++++++++++++++++
 fedora-release-notes.spec         |   31 ++++++++++++++++++++-----------
 po/sv.po                          |    8 ++------
 share/fedora-release-notes.omf.in |   35 -----------------------------------
 4 files changed, 57 insertions(+), 52 deletions(-)

New commits:
commit 488825ee1df4c0bf19e86ef762703698445615f6
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Oct 29 01:17:28 2008 -0400

    Sync spec with Fedora packages CVS

diff --git a/fedora-release-notes.spec b/fedora-release-notes.spec
index ec9e6a9..0e3ab1e 100644
--- a/fedora-release-notes.spec
+++ b/fedora-release-notes.spec
@@ -22,8 +22,10 @@ BuildRequires:	desktop-file-utils
 Provides:	indexhtml = %{version}-%{release}
 Obsoletes:	indexhtml < 9-3
 
+Provides:	system-release-notes = %{version}-%{release}
+
 %description 
-These are the official Release Notes for Fedora 9,
+These are the official Release Notes for Fedora 10,
 written and edited by the Fedora community.  For more
 information on the Release Notes process or how you can
 contribute, refer to the Release Notes HOWTO located at
@@ -39,11 +41,7 @@ http://fedoraproject.org/wiki/Docs/Beats/HowTo.
 
 
 %build
-#cat %{SOURCE1} > index.html
-#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
+# One day maybe we'll use Publican here.
 
 
 %install
@@ -132,6 +130,11 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev
 * Fri Oct 17 2008 Paul W. Frields <stickster at gmail.com> - 9.92-2
 - Update version for Fedora 10 Preview Release
 
+* Thu Oct  2 2008 Paul W. Frields <stickster at gmail.com> - 9.92-1
+- Bump version and release to match for F10 Preview Release
+- Fix description
+- Fix missing README content
+
 * Sat Jul 19 2008 Paul W. Frields <stickster at gmail.com> - 9.0.2-1
 - Content and translation updates
 - Fix description (#453255)
@@ -142,6 +145,9 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev
 * Wed Apr 16 2008 Paul W. Frields <stickster at gmail.com> - 9.0.0-1
 - Update for Fedora 9 final release
 
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 8.92-2
+- Provides: system-release-notes
+
 * Thu Mar 20 2008 Paul W. Frields <stickster at gmail.com> - 8.92-1
 - Bump version for Fedora 9 Preview Release
 


commit 99b7272328243042e119ec67729bfae0d1e1dd71
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Oct 29 00:54:11 2008 -0400

    Remove css dir usage from spec file

diff --git a/fedora-release-notes.spec b/fedora-release-notes.spec
index 232e89f..ec9e6a9 100644
--- a/fedora-release-notes.spec
+++ b/fedora-release-notes.spec
@@ -60,7 +60,7 @@ for F in Release_Notes-*.html; do
   L=`echo ${F} | %{__sed} 's/Release_Notes-\(.*\)\.html/\1/'`
   install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${F}
   ln -s ../../fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
-  for D in css stylesheet-images ; do
+  for D in stylesheet-images ; do
     install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D}
     find $D -type f | while read foo ; do ln -s ../../../$foo $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D} ; done
   done 


commit b39e5de7800c4418f92d29220aaa0c7837465bfd
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Oct 29 00:53:26 2008 -0400

    Fix validation error in sv locale

diff --git a/po/sv.po b/po/sv.po
index 510738f..9cf7144 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: release-notes\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-24 12:24-0400\n"
-"PO-Revision-Date: 2008-10-25 12:45-0400\n"
+"PO-Revision-Date: 2008-10-29 00:53-0400\n"
 "Last-Translator: Magnus Larsson <fedoratrans at gmail.com>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -2935,11 +2935,7 @@ msgid ""
 "versions since only the kernel-devel package is required now to build "
 "external modules. Configured sources are available, as described <xref "
 "linkend=\"sn-Kernel_flavors\"/>."
-msgstr ""
-"Fedora 10 innehåller inte paketet kernel-source som fanns i äldre versioner "
-"eftersom endast paketet kernel-devel behövs nu för att bygga externa "
-"moduler. Konfigurerad källkod finns, enligt beskrivning i <xref linkend=\"sn-"
-"Kernel-Flavors\"/>"
+msgstr "Fedora 10 innehåller inte paketet kernel-source som fanns i äldre versioner eftersom endast paketet kernel-devel behövs nu för att bygga externa moduler. Konfigurerad källkod finns, enligt beskrivning i <xref linkend=\"sn-Kernel_flavors\"/>"
 
 #: en_US/Linux_kernel.xml:125(title)
 msgid "Custom Kernel Building"


commit f63e52762f2dbb0b1062e1856a88ba38ab8f9a70
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Oct 29 00:50:38 2008 -0400

    Fix specfile for proper building

diff --git a/fedora-release-notes.spec b/fedora-release-notes.spec
index f461432..232e89f 100644
--- a/fedora-release-notes.spec
+++ b/fedora-release-notes.spec
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	9.92
-Release:	2
+Release:	3
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -51,13 +51,13 @@ 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 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-for DIR in css stylesheet-images ; do
+for DIR in 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 \;
 done
 # Don't like using links, but this cuts the payload by ~75%.
-for F in RELEASE-NOTES-*.html; do
-  L=`echo ${F} | %{__sed} 's/RELEASE-NOTES-\(.*\)\.html/\1/'`
+for F in Release_Notes-*.html; do
+  L=`echo ${F} | %{__sed} 's/Release_Notes-\(.*\)\.html/\1/'`
   install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${F}
   ln -s ../../fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
   for D in css stylesheet-images ; do
@@ -126,6 +126,9 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev
 
 
 %changelog
+* Tue Oct 28 2008 Paul W. Frields <stickster at gmail.com> - 9.92-3
+- Correct file names for Fedora 10 Preview Release
+
 * Fri Oct 17 2008 Paul W. Frields <stickster at gmail.com> - 9.92-2
 - Update version for Fedora 10 Preview Release
 


commit b914d2a3eb03ce6fc305aae21c42eddce32c4361
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Oct 29 00:50:16 2008 -0400

    Move omf.in back to primary lang dir

diff --git a/en_US/fedora-release-notes.omf.in b/en_US/fedora-release-notes.omf.in
new file mode 100644
index 0000000..64e1337
--- /dev/null
+++ b/en_US/fedora-release-notes.omf.in
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN"
+"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
+
+<omf>
+  <resource>
+    <creator>
+      fedora-docs-list at redhat.com (Fedora Documentation Project)
+    </creator>
+    <maintainer>
+      fedora-docs-list at redhat.com (Fedora Documentation Project)
+    </maintainer>
+    <title>
+      Fedora Release Notes
+    </title>
+    <date>
+      @DATE@
+    </date>
+    <version identifier="@RELEASE@" date="@DATE@"
+      description="fedora-release-notes- at RELEASE@"/>
+    <subject category="General|Linux|Distributions|Other"/>
+    <description>
+      Important information about this release of Fedora
+    </description>
+    <type>
+      About
+    </type>
+    <format mime="text/html"/>
+    <identifier url="file:///usr/share/gnome/help/fedora-release-notes/@LANG@/RELEASE-NOTES.xml"/>
+    <language code="@LANGC@"/>
+    <relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
+    <rights type="OPL" license="http://opencontent.org/openpub/"
+      license.version="1.0"/>
+  </resource>
+</omf>
diff --git a/share/fedora-release-notes.omf.in b/share/fedora-release-notes.omf.in
deleted file mode 100644
index 64e1337..0000000
--- a/share/fedora-release-notes.omf.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN"
-"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
-
-<omf>
-  <resource>
-    <creator>
-      fedora-docs-list at redhat.com (Fedora Documentation Project)
-    </creator>
-    <maintainer>
-      fedora-docs-list at redhat.com (Fedora Documentation Project)
-    </maintainer>
-    <title>
-      Fedora Release Notes
-    </title>
-    <date>
-      @DATE@
-    </date>
-    <version identifier="@RELEASE@" date="@DATE@"
-      description="fedora-release-notes- at RELEASE@"/>
-    <subject category="General|Linux|Distributions|Other"/>
-    <description>
-      Important information about this release of Fedora
-    </description>
-    <type>
-      About
-    </type>
-    <format mime="text/html"/>
-    <identifier url="file:///usr/share/gnome/help/fedora-release-notes/@LANG@/RELEASE-NOTES.xml"/>
-    <language code="@LANGC@"/>
-    <relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
-    <rights type="OPL" license="http://opencontent.org/openpub/"
-      license.version="1.0"/>
-  </resource>
-</omf>

More information about the docs-commits mailing list