rpms/fedora-release-notes/devel .cvsignore, 1.18, 1.19 fedora-release-notes.spec, 1.36, 1.37 sources, 1.28, 1.29

Paul W. Frields pfrields at fedoraproject.org
Wed Mar 24 17:47:33 UTC 2010


Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5537

Modified Files:
	.cvsignore fedora-release-notes.spec sources 
Log Message:
Update to new F13 Beta Release Notes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	8 Nov 2008 01:29:52 -0000	1.18
+++ .cvsignore	24 Mar 2010 17:47:32 -0000	1.19
@@ -1,6 +1 @@
-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
+fedora-release-notes-12.0.95.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- fedora-release-notes.spec	24 Jul 2009 22:37:52 -0000	1.36
+++ fedora-release-notes.spec	24 Mar 2010 17:47:32 -0000	1.37
@@ -1,136 +1,139 @@
-Name:		fedora-release-notes
-Version:	10.0.0
-Release:	0.4
-Summary:	Release Notes for Fedora 10
-URL:		http://fedoraproject.org/wiki/Docs/Beats
+# Documentation Specfile
 
+Name:		fedora-release-notes
+Version:	12.0.95
+Release:	2%{?dist}
+Summary:	Release Notes
+URL:		http://fedoraproject.org
 Group:		System Environment/Base
-License:	Open Publication
+License:	CC-BY-SA
 Source0:	fedora-release-notes-%{version}.tar.gz
-Source1:	homepage-%{version}.tar.gz
-Source2:	about-fedora-%{version}.tar.gz
-Source3:	README-%{version}.tar.gz
-Source4:	README-BURNING-ISOS-%{version}.tar.gz
-Source5:	readme-live-image-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:	noarch
-BuildRequires:	desktop-file-utils
-# 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.
-Provides:	indexhtml = %{version}-%{release}
-Obsoletes:	indexhtml < 9-3
-
-Provides:	system-release-notes = %{version}-%{release}
-
-%description 
-These are the official Release Notes for Fedora 10,
-written and edited by the Fedora community.  For more
+Requires:	htmlview
+Provides:	fedora-release-notes = %{version}-%{release}
+
+%description
+These are the official Release Notes for Fedora 13,
+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
-http://fedoraproject.org/wiki/Docs/Beats/HowTo.
+http://fedoraproject.org/wiki/Docs/Beats/HowTo. 
 
 %prep
 %setup -q
-%setup -D -q -a 1
-%setup -D -q -a 2
-%setup -D -q -a 3
-%setup -D -q -a 4
-%setup -D -q -a 5
-
 
 %build
-# One day maybe we'll use Publican here.
-
 
 %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 document/* ; do
+  #
+  # First, the html in /usr/share/doc/HTML, then descend
+  # through any subdirectories, installing everything found.
+  #
+  # Language to process
+  LANG=${LANGDIR#document/}
+  # Target for the html
+  NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
+  # Place where html files are
+  SRCBASE=${LANGDIR}
+  mkdir -p ${NOTETARG}
+  mkdir -p ${NOTETARG}/images
+  install -m 644 ${SRCBASE}/images/*.svg ${NOTETARG}/images/
+  mkdir -p ${NOTETARG}/Common_Content
+  mkdir -p ${NOTETARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/Common_Content/images/*.png \
+        ${NOTETARG}/Common_Content/images/
+  install -m 644 ${SRCBASE}/Common_Content/images/*.svg \
+        ${NOTETARG}/Common_Content/images/
+  mkdir -p ${NOTETARG}/Common_Content/css
+  install -m 644 ${SRCBASE}/Common_Content/css/*.css \
+        ${NOTETARG}/Common_Content/css/
+  install -m 644 ${SRCBASE}/*.html ${NOTETARG}/
 done
-pushd README-%{version}/
-for F in README-*.txt; do
-  L=`echo ${F} | %{__sed} 's/README-\(.*\)\.txt/\1/'`
-  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme/${L}/${F}
-done
-popd
-pushd README-BURNING-ISOS-%{version}/
-for F in README-BURNING-ISOS-*.txt; do
-  L=`echo ${F} | %{__sed} 's/README-BURNING-ISOS-\(.*\)\.txt/\1/'`
-  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-burning-isos/${L}/${F}
-done
-popd
-pushd readme-live-image-%{version}/
-for F in readme-live-image-*.txt; do
-  L=`echo ${F} | %{__sed} 's/readme-live-image-\(.*\)\.txt/\1/'`
-  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-live-image/${L}/${F}
-done
-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
-install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
-install -m 644 images/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
-popd
-pushd about-fedora-%{version}
-find about-fedora/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/{} \;
-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
-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}/
-
+#
+# index.html
+#
+install -m 644 index.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}
+#
+# Now the desktop files
+#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde4
+SRCBASE=desktop
+install -m 644 ${SRCBASE}/fedora-release-notes.desktop \
+      $RPM_BUILD_ROOT%{_datadir}/applications
+install -m 644 ${SRCBASE}/fedora-release-notes.KDE.desktop \
+      $RPM_BUILD_ROOT%{_datadir}/applications/kde4/fedora-release-notes.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q -o %{_datadir}/omf/%{name}:%{_datadir}/omf/about-fedora ; fi
 if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi
 
 %postun
 if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi
 if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi
 
-
 %files
 %defattr(-,root,root,-)
 %{_defaultdocdir}/HTML
-%{_datadir}/gnome/help/about-fedora/
-%{_datadir}/gnome/help/fedora-release-notes/
-%{_datadir}/applications/about-fedora.desktop
-%{_datadir}/omf/fedora-release-notes/
-%{_datadir}/omf/about-fedora/
-
+%{_datadir}/applications/fedora-release-notes.desktop
+%{_datadir}/applications/kde4/fedora-release-notes.desktop
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.0-0.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Mar 24 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-2
+- Build for Beta
 
-* 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
+* Wed Mar 24 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-1
+- Test Build
 
-* Fri Nov  7 2008 Paul W. Frields <stickster at gmail.com> - 10.0.0-0.1
+* Tue Nov  9 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.2-1
+- Correct issue with about-fedora omf files
+
+* Tue Nov  9 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.1-1
+- Zero day updates
+
+* Tue Nov  2 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.0-4
+- Eliminate publican during the build due to 0.44 => 1.0 probs
+
+* Tue Nov  2 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.0-3
+- requires publican publican-fedora
+
+* Tue Nov  2 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.0-2
+- Touch up .omf files for about-fedora
+
+* Mon Nov  2 2009 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.0-1
+- Fedora 12 notes
+- Compared to Fedora 11, many documents and formats omitted
+- Only xml provided and then only for f-r-n and about-fedora.
+
+* Fri May 29 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.1-2
+- More translations, bump release
+
+* Thu May 28 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.1-1
+- Updated english in release-notes, bump version
+
+* Wed May 13 2009 Paul W. Frields <stickster at gmail.com> - 11.0.0-2
+- Fix homepage content
+
+* Thu May  7 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.0-1
+- Update for Fedora 11 release candidate
+
+* 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.2
 - Snapshot package for updated fedora-release compatibility
 
 * Thu Oct 30 2008 Paul W. Frields <stickster at gmail.com> - 9.92-4
@@ -283,4 +286,3 @@ if [ -x /usr/bin/update-desktop-database
 
 * Sun Jul 16 2006 Paul W. Frields <stickster at gmail.com> - 5.91-1
 - Initial release for Fedora Core 6 test2.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	8 Nov 2008 01:29:52 -0000	1.28
+++ sources	24 Mar 2010 17:47:33 -0000	1.29
@@ -1,6 +1 @@
-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
+296b3f08b4a5c9deec4c85fc95c564be  fedora-release-notes-12.0.95.tar.gz



More information about the scm-commits mailing list