Branch 'f13' - 2 commits - build/fedora-release-notes.spec en-US/images
Paul W. Frields
pfrields at fedoraproject.org
Mon May 3 19:07:22 UTC 2010
build/fedora-release-notes.spec | 226 +++++++++--------------
en-US/images/16x16/apps/fedora-release-notes.png |binary
en-US/images/22x22/apps/fedora-release-notes.png |binary
en-US/images/24x24/apps/fedora-release-notes.png |binary
en-US/images/32x32/apps/fedora-release-notes.png |binary
en-US/images/48x48/apps/fedora-release-notes.png |binary
6 files changed, 96 insertions(+), 130 deletions(-)
New commits:
commit d862d039a6d7e8c911a5590e90c7dfa500686625
Author: Paul W. Frields <stickster at gmail.com>
Date: Mon May 3 12:40:13 2010 -0400
Use new icons, place in hicolor theme per XDG
diff --git a/en-US/images/16x16/apps/fedora-release-notes.png b/en-US/images/16x16/apps/fedora-release-notes.png
new file mode 100644
index 0000000..91a6e1e
Binary files /dev/null and b/en-US/images/16x16/apps/fedora-release-notes.png differ
diff --git a/en-US/images/22x22/apps/fedora-release-notes.png b/en-US/images/22x22/apps/fedora-release-notes.png
new file mode 100644
index 0000000..86ddd39
Binary files /dev/null and b/en-US/images/22x22/apps/fedora-release-notes.png differ
diff --git a/en-US/images/24x24/apps/fedora-release-notes.png b/en-US/images/24x24/apps/fedora-release-notes.png
new file mode 100644
index 0000000..55c3a7c
Binary files /dev/null and b/en-US/images/24x24/apps/fedora-release-notes.png differ
diff --git a/en-US/images/32x32/apps/fedora-release-notes.png b/en-US/images/32x32/apps/fedora-release-notes.png
new file mode 100644
index 0000000..66fa0cd
Binary files /dev/null and b/en-US/images/32x32/apps/fedora-release-notes.png differ
diff --git a/en-US/images/48x48/apps/fedora-release-notes.png b/en-US/images/48x48/apps/fedora-release-notes.png
new file mode 100644
index 0000000..e009a11
Binary files /dev/null and b/en-US/images/48x48/apps/fedora-release-notes.png differ
commit 229ae8e0ba7415dafd971721fc85dd6d51c7d56c
Author: Paul W. Frields <stickster at gmail.com>
Date: Mon May 3 15:06:09 2010 -0400
Pull in specfile from master branch
diff --git a/build/fedora-release-notes.spec b/build/fedora-release-notes.spec
index 380225c..74dcdb9 100644
--- a/build/fedora-release-notes.spec
+++ b/build/fedora-release-notes.spec
@@ -1,179 +1,145 @@
# 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: 11.0.1
-Release: 2%{?dist}
-Summary: Release Notes for Fedora 11
-URL: http://fedoraproject.org/wiki/Documentation_Beats
-
+Version: 13
+Release: 1%{?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
-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.
-Provides: indexhtml = %{version}-%{release}
-Obsoletes: indexhtml < 10-3
-
-Provides: system-release-notes = %{version}-%{release}
-
-%description
-These are the official Release Notes for Fedora 11,
-written and edited by the Fedora community. For more
+%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
-%{__make} html-single-all
-%{__make} xml-all
-
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}
-
#
# Loop through the languages
#
-for LANGDIR in tmp/* ; do
+cat /dev/null > html.lang
+for LANGDIR in document/* ; do
#
- # First, the html in /usr/share/doc/HTML
+ # First, the html in /usr/share/doc/HTML, then descend
+ # through any subdirectories, installing everything found.
#
- # Place where html files are
- LANG=${LANGDIR#tmp/}
- SRCBASE=tmp/${LANG}/html-single
- # Target for release notes html
+ # 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}
- install -m 644 ${SRCBASE}/index.html ${NOTETARG}/%{name}-${LANG}.html
+ 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/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/'`
- 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}
+ 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
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
-
+#
+# 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
+
+#%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
+#done
+cat html.lang >> %{name}.lang
%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
+* Sun May 2 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.97.0-9
+- Test build prior to GA rpm
+* Sat May 1 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.97.0-8
+- Change KDE desktop file BZ#482947
+
+* Tue Apr 27 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.97.0-7
+- Write to html.lang
+
+* Mon Apr 5 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-4
+- Remove dependency on htmlview for non-desktop installs
+
+* Wed Mar 24 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-3
+- Correct license, requires
+
+* Wed Mar 24 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-2
+- Build for Beta
+
+* Wed Mar 24 2010 John J. McDonough <jjmcd at fedoraproject.org> - 12.0.95-1
+- Test Build
+
+* 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.
-%changelog
* Fri May 29 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.1-2
- More translations, bump release
More information about the docs-commits
mailing list