rpms/fedora-release-notes/F-11 .cvsignore, 1.18, 1.19 fedora-release-notes.spec, 1.35, 1.36 import.log, 1.2, 1.3 sources, 1.28, 1.29

Jesse Keating jkeating at fedoraproject.org
Tue Apr 21 20:40:16 UTC 2009 

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release-notes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25888/F-11

Modified Files:
	.cvsignore fedora-release-notes.spec import.log sources 
Log Message:
New upstream release.  Purposefully stomping on automated rebuild changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Nov 2008 01:29:52 -0000	1.18
+++ .cvsignore	21 Apr 2009 20:40:12 -0000	1.19
@@ -1,6 +1,6 @@
-README-10.0.0.tar.gz
-README-BURNING-ISOS-10.0.0.tar.gz
-about-fedora-10.0.0.tar.gz
-fedora-release-notes-10.0.0.tar.gz
-homepage-10.0.0.tar.gz
-readme-live-image-10.0.0.tar.gz
+README-10.93.0.tar.gz
+README-BURNING-ISOS-10.93.0.tar.gz
+about-fedora-10.93.0.tar.gz
+fedora-release-notes-10.93.0.tar.gz
+homepage-10.93.0.tar.gz
+readme-live-image-10.93.0.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/fedora-release-notes.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fedora-release-notes.spec	27 Feb 2009 22:32:22 -0000	1.35
+++ fedora-release-notes.spec	21 Apr 2009 20:40:12 -0000	1.36
@@ -1,7 +1,18 @@
+# Documentation Specfile
+%define HTMLVIEW %(eval 'if [ "%{?dist}" = ".el5" ]; then echo "1"; else echo "0"; fi')
+
+%define viewer xdg-open
+
+%if %{HTMLVIEW}
+%define viewer htmlview
+%define vendor redhat-
+%define vendoropt --vendor="redhat"
+%endif
+
 Name:		fedora-release-notes
-Version:	10.0.0
-Release:	0.3
-Summary:	Release Notes for Fedora 10
+Version:	10.93.0
+Release:	1%{?dist}
+Summary:	Release Notes for Fedora 11
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
@@ -16,6 +27,15 @@
 
 BuildArch:	noarch
 BuildRequires:	desktop-file-utils
+BuildRequires:	publican
+BuildRequires:	publican-fedora
+
+%if %{HTMLVIEW}
+Requires:	htmlview
+%else
+Requires:	xdg-utils
+%endif
+
 # In a perfect world, this spec would Requires: system-logos >=
 # 7.90.0-1, but we do not want to burden yum upgraders or respinners
 # unnecessarily.
@@ -25,7 +45,7 @@
 Provides:	system-release-notes = %{version}-%{release}
 
 %description 
-These are the official Release Notes for Fedora 10,
+These are the official Release Notes for Fedora 11,
 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
@@ -41,28 +61,62 @@
 
 
 %build
-# One day maybe we'll use Publican here.
+%{__make} html-desktop-all
+%{__make} xml-all
 
 
 %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 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
-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/'`
-  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 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 
+mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}
+
+#
+# Loop through the languages
+#
+for LANGDIR in tmp/* ; do
+  #
+  # First, the html in /usr/share/doc/HTML
+  #
+  # Place where html files are
+  LANG=${LANGDIR#tmp/}
+  SRCBASE=tmp/${LANG}/html-desktop
+  # Target for release notes html
+  NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
+  mkdir -p ${NOTETARG}
+  install -m 644 ${SRCBASE}/index.html ${NOTETARG}/%{name}-${LANG}.html
+  mkdir -p ${NOTETARG}/Common_Content
+  mkdir -p ${NOTETARG}/Common_Content/css
+  mkdir -p ${NOTETARG}/Common_Content/images
+  mkdir -p ${NOTETARG}/images
+  install -m 644 ${SRCBASE}/Common_Content/css/* ${NOTETARG}/Common_Content/css
+  install -m 644 ${SRCBASE}/Common_Content/images/* ${NOTETARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/images/* ${NOTETARG}/images
+  #
+  # Now the gnome_help files
+  #
+  # Place where xml files are
+  SRCBASE=tmp/${LANG}/xml
+  # gnome-help target for xml files
+  HELPTARG=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}/${LANG}
+  mkdir -p ${HELPTARG}
+  mkdir -p ${HELPTARG}/Common_Content
+  mkdir -p ${HELPTARG}/images
+  install -m 644 ${SRCBASE}/images/* ${HELPTARG}/images
+  for F in ${SRCBASE}/Common_Content/*.xml ; do
+    install -m 644 ${F} ${HELPTARG}/Common_Content
+  done
+  mkdir -p ${HELPTARG}/Common_Content/css
+  install -m 644  ${SRCBASE}/Common_Content/css/* ${HELPTARG}/Common_Content/css
+  mkdir -p ${HELPTARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/Common_Content/images/* ${HELPTARG}/Common_Content/images
+  for F in ${SRCBASE}/*.xml ; do
+    install -m 644 ${F} ${HELPTARG}/
+  done
+  install -m 644 ${SRCBASE}/Release_Notes.ent ${HELPTARG}/
 done
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/%{name}
+install -m 644 omf/*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
+
 pushd README-%{version}/
 for F in README-*.txt; do
   L=`echo ${F} | %{__sed} 's/README-\(.*\)\.txt/\1/'`
@@ -93,11 +147,6 @@
 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
-pushd ghelp
-find -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/fedora-release-notes/{} \;
-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
@@ -123,11 +172,15 @@
 %{_datadir}/omf/about-fedora/
 
 
+
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.0-0.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 14 2009 John J. McDonough <jjmcd at fedoraproject.org> - 10.93.0-1
+- Use publican for F11 Preview release
+
+* Sun Nov 16 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-1
+- Updates for F10 GA release
 
-* Fri Nov  7 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-0.1
+* Fri Nov  7 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-0.2
 - Snapshot package for updated fedora-release compatibility
 
 * Thu Oct 30 2008 Paul W. Frields <stickster at gmail.com> - 9.92-4
@@ -280,4 +333,3 @@
 
 * Sun Jul 16 2006 Paul W. Frields <stickster at gmail.com> - 5.91-1
 - Initial release for Fedora Core 6 test2.
-


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2008 01:29:52 -0000	1.2
+++ import.log	21 Apr 2009 20:40:12 -0000	1.3
@@ -1,2 +1,3 @@
 fedora-release-notes-9_92-3:HEAD:fedora-release-notes-9.92-3.src.rpm:1225277926
 fedora-release-notes-10_0_0-0_1:HEAD:fedora-release-notes-10.0.0-0.1.src.rpm:1226107703
+fedora-release-notes-10_93_0-1_fc10:F-11:fedora-release-notes-10.93.0-1.fc10.src.rpm:1240345993


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	8 Nov 2008 01:29:52 -0000	1.28
+++ sources	21 Apr 2009 20:40:12 -0000	1.29
@@ -1,6 +1,6 @@
-c6e230bb36bab630112c5a93740f2f7e  README-10.0.0.tar.gz
-cef78a768ca7f9ce5aca2f2b61280162  README-BURNING-ISOS-10.0.0.tar.gz
-d4d4d3e2677812d66c69b4e96d654ee7  about-fedora-10.0.0.tar.gz
-3405838309537b2cc4032cc8588a0d45  fedora-release-notes-10.0.0.tar.gz
-69f49caf6c4a6470f80836b7cd0a1291  homepage-10.0.0.tar.gz
-d3b32700b8de676d8af39998ca96fc9c  readme-live-image-10.0.0.tar.gz
+95c56c8400816c5739a795bbaeb7998c  README-10.93.0.tar.gz
+4d6df8b91cdef65482c2e12b551b525e  README-BURNING-ISOS-10.93.0.tar.gz
+1f10f301845d8666a64f86faaf3f910d  about-fedora-10.93.0.tar.gz
+5dbf898ad4d8074e47ce86bcb6dada4d  fedora-release-notes-10.93.0.tar.gz
+3a313db11a49705079a4cca80b3b41a1  homepage-10.93.0.tar.gz
+bd081a3b4df49a10b67c7b02912fc164  readme-live-image-10.93.0.tar.gz

More information about the fedora-extras-commits mailing list