From 2d0221f1ffdd16f9f5834cdee0813ebf4ede3ca2 Mon Sep 17 00:00:00 2001 From: John J. McDonough Date: May 11 2010 12:38:50 +0000 Subject: Update to latest specfile --- diff --git a/build/fedora-release-notes.spec b/build/fedora-release-notes.spec index 74dcdb9..3bbdcce 100644 --- a/build/fedora-release-notes.spec +++ b/build/fedora-release-notes.spec @@ -1,21 +1,26 @@ # Documentation Specfile -Name: fedora-release-notes -Version: 13 -Release: 1%{?dist} -Summary: Release Notes -URL: http://fedoraproject.org -Group: System Environment/Base -License: CC-BY-SA -Source0: fedora-release-notes-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +Name: fedora-release-notes +Version: 13 +Release: 5%{?dist} +Summary: Release Notes +URL: http://fedoraproject.org +Group: System Environment/Base +License: CC-BY-SA +Source0: fedora-release-notes-%{version}.tar.gz +Source1: fedora-release-notes16.png +Source2: fedora-release-notes22.png +Source3: fedora-release-notes24.png +Source4: fedora-release-notes32.png +Source5: fedora-release-notes48.png +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch %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 @@ -31,35 +36,43 @@ mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name} # cat /dev/null > html.lang 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 -d ${SRCBASE}/images/* $RPM_BUILD_ROOT%{_sharedir}/icons/hicolor/apps - echo "${NOTETARG}/" >> html.lang - 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/ - echo "${NOTETARG}/" >> html.lang - mkdir -p ${NOTETARG}/Common_Content/css - install -m 644 ${SRCBASE}/Common_Content/css/*.css \ - ${NOTETARG}/Common_Content/css/ - echo "${NOTETARG}/" >> html.lang - echo "${NOTETARG}/" >> html.lang - install -m 644 ${SRCBASE}/*.html ${NOTETARG}/ - echo "${NOTETARG}/" >> html.lang +# +# 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}/images +echo "${NOTETARG}/" >> html.lang +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/*.svg \ +${NOTETARG}/Common_Content/images/ +install -m 644 ${SRCBASE}/Common_Content/images/*.png \ +${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 + +ICONDIR="$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/" +for SZ in 16 22 24 32 48 ; do +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${SZ}x${SZ}/apps done +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps +install -m 644 %{SOURCE1} ${ICONDIR}/16x16/apps/fedora-release-notes.png +install -m 644 %{SOURCE2} ${ICONDIR}/22x22/apps/fedora-release-notes.png +install -m 644 %{SOURCE3} ${ICONDIR}/24x24/apps/fedora-release-notes.png +install -m 644 %{SOURCE4} ${ICONDIR}/32x32/apps/fedora-release-notes.png +install -m 644 %{SOURCE5} ${ICONDIR}/48x48/apps/fedora-release-notes.png +install -m 644 document/en-US/images/icon.svg ${ICONDIR}/scalable/apps/fedora-release-notes.svg + # # index.html # @@ -70,15 +83,19 @@ install -m 644 index.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde4 SRCBASE=desktop +# Fix the icon location +for F in fedora-release-notes.desktop fedora-release-notes.KDE.desktop; do +sed -i 's/^Icon=.*/Icon=fedora-release-notes/' ${SRCBASE}/${F} +done install -m 644 ${SRCBASE}/fedora-release-notes.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applications +$RPM_BUILD_ROOT%{_datadir}/applications install -m 644 ${SRCBASE}/fedora-release-notes.KDE.desktop \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde4/fedora-release-notes.desktop +$RPM_BUILD_ROOT%{_datadir}/applications/kde4/fedora-release-notes.desktop #%find_lang %{name} --with-gnome --all-name #for F in $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index-*.html ; do -# L=`echo ${F} | %{__sed} 's/.*\/index-\(.*\)\.html$/\1/'` -# echo "%%lang(${L}) ${F#$RPM_BUILD_ROOT}" >> html.lang +# L=`echo ${F} | %{__sed} 's/.*\/index-\(.*\)\.html$/\1/'` +# echo "%%lang(${L}) ${F#$RPM_BUILD_ROOT}" >> html.lang #done cat html.lang >> %{name}.lang @@ -86,10 +103,19 @@ cat html.lang >> %{name}.lang rm -rf $RPM_BUILD_ROOT %post +if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi +touch --no-create /usr/share/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then +gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || : +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 +touch --no-create /usr/share/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then +gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || : +fi if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi %files @@ -97,18 +123,37 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev %{_defaultdocdir}/HTML %{_datadir}/applications/fedora-release-notes.desktop %{_datadir}/applications/kde4/fedora-release-notes.desktop +%{_datadir}/icons/hicolor/*/apps/* %changelog -* Sun May 2 2010 John J. McDonough - 12.97.0-9 +* Tue May 11 2010 John J. McDonough - 13-5 +- Add Russian translation + +* Mon May 10 2010 John J. McDonough - 13-4 +- Zero day updates: +- Configuration change in varnish, BZ#588953 +- Incorrect link in kernel BZ#590492 + +* Mon May 3 2010 Paul W. Frields - 13-3 +- Include ToC in document + +* Mon May 3 2010 Paul W. Frields - 13-2 +- Remove unnecessary desktop file validation + +* Mon May 3 2010 Paul W. Frields - 13-1 +- Update for F13 GA release +- Add icons for hicolor theme per XDG + +* Sun May 2 2010 John J. McDonough - 12.97.0-9 - Test build prior to GA rpm -* Sat May 1 2010 John J. McDonough - 12.97.0-8 +* Sat May 1 2010 John J. McDonough - 12.97.0-8 - Change KDE desktop file BZ#482947 * Tue Apr 27 2010 John J. McDonough - 12.97.0-7 - Write to html.lang -* Mon Apr 5 2010 John J. McDonough - 12.0.95-4 +* Mon Apr 5 2010 John J. McDonough - 12.0.95-4 - Remove dependency on htmlview for non-desktop installs * Wed Mar 24 2010 John J. McDonough - 12.0.95-3 @@ -120,22 +165,22 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Wed Mar 24 2010 John J. McDonough - 12.0.95-1 - Test Build -* Tue Nov 9 2009 John J. McDonough - 12.0.2-1 +* Tue Nov 9 2009 John J. McDonough - 12.0.2-1 - Correct issue with about-fedora omf files -* Tue Nov 9 2009 John J. McDonough - 12.0.1-1 +* Tue Nov 9 2009 John J. McDonough - 12.0.1-1 - Zero day updates -* Tue Nov 2 2009 John J. McDonough - 12.0.0-4 +* Tue Nov 2 2009 John J. McDonough - 12.0.0-4 - Eliminate publican during the build due to 0.44 => 1.0 probs -* Tue Nov 2 2009 John J. McDonough - 12.0.0-3 +* Tue Nov 2 2009 John J. McDonough - 12.0.0-3 - requires publican publican-fedora -* Tue Nov 2 2009 John J. McDonough - 12.0.0-2 +* Tue Nov 2 2009 John J. McDonough - 12.0.0-2 - Touch up .omf files for about-fedora -* Mon Nov 2 2009 John J. McDonough - 12.0.0-1 +* Mon Nov 2 2009 John J. McDonough - 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. @@ -149,7 +194,7 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Wed May 13 2009 Paul W. Frields - 11.0.0-2 - Fix homepage content -* Thu May 7 2009 John J. McDonough - 11.0.0-1 +* Thu May 7 2009 John J. McDonough - 11.0.0-1 - Update for Fedora 11 release candidate * Tue Apr 14 2009 John J. McDonough - 10.93.0-1 @@ -158,7 +203,7 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Sun Nov 16 2008 Paul W. Frields - 10.0.0-1 - Updates for F10 GA release -* Fri Nov 7 2008 Paul W. Frields - 10.0.0-0.2 +* Fri Nov 7 2008 Paul W. Frields - 10.0.0-0.2 - Snapshot package for updated fedora-release compatibility * Thu Oct 30 2008 Paul W. Frields - 9.92-4 @@ -170,7 +215,7 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Fri Oct 17 2008 Paul W. Frields - 9.92-2 - Update version for Fedora 10 Preview Release -* Thu Oct 2 2008 Paul W. Frields - 9.92-1 +* Thu Oct 2 2008 Paul W. Frields - 9.92-1 - Bump version and release to match for F10 Preview Release - Fix description - Fix missing README content @@ -191,10 +236,10 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Thu Mar 20 2008 Paul W. Frields - 8.92-1 - Bump version for Fedora 9 Preview Release -* Wed Nov 7 2007 Paul W. Frields - 8.90-1 +* Wed Nov 7 2007 Paul W. Frields - 8.90-1 - Update for F-9 development branch -* Wed Nov 7 2007 Paul W. Frields - 8.0.1-1 +* Wed Nov 7 2007 Paul W. Frields - 8.0.1-1 - Update with various bugfixes and translation updates * Tue Oct 30 2007 Paul W. Frields - 8.0.0-3 @@ -261,7 +306,7 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev - Fix IG publication URL - Amend CSS to respect font selections and restore icons -* Sun Oct 8 2006 Paul W. Frields - 6-2 +* Sun Oct 8 2006 Paul W. Frields - 6-2 - Localize About Fedora menu item (somewhat) * Thu Oct 05 2006 Jesse Keating - 6-1 @@ -279,23 +324,23 @@ if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev * Mon Sep 11 2006 Paul W. Frields - 5.92-4 - Update about-fedora -* Wed Sep 6 2006 Paul W. Frields - 5.92-3 +* Wed Sep 6 2006 Paul W. Frields - 5.92-3 - Make sure we package README-BURNING-ISOS files -* Tue Sep 5 2006 Jesse Keating - 5.92-1 +* Tue Sep 5 2006 Jesse Keating - 5.92-1 - Bump for 5.92 -* Fri Sep 1 2006 Paul W. Frields - 5.91-8 +* Fri Sep 1 2006 Paul W. Frields - 5.91-8 - Handle i18n OMF files * Sat Aug 26 2006 Paul W. Frields - 5.91-7 - Add README-BURNING-ISOS.txt for inclusion in mirrors - Put About document in proper directory -* Wed Aug 2 2006 Jesse Keating - 5.91-6 +* Wed Aug 2 2006 Jesse Keating - 5.91-6 - bump -* Wed Aug 2 2006 Paul W. Frields - 5.91-5 +* Wed Aug 2 2006 Paul W. Frields - 5.91-5 - Add README-Accessibility (moved from fedora-release) * Wed Jul 26 2006 Paul W. Frields - 5.91-4