rpms/fedora-release-notes/F-13 .cvsignore, 1.21, 1.22 fedora-release-notes.spec, 1.44, 1.45 sources, 1.32, 1.33
John J. McDonough
jjmcd at fedoraproject.org
Sun May 23 20:01:06 UTC 2010
Author: jjmcd
Update of /cvs/pkgs/rpms/fedora-release-notes/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17345
Modified Files:
.cvsignore fedora-release-notes.spec sources
Log Message:
Bugfixes 587704, 591694, 594466 plus additional languages
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-13/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 12 May 2010 00:03:27 -0000 1.21
+++ .cvsignore 23 May 2010 20:01:06 -0000 1.22
@@ -1 +1 @@
-fedora-release-notes-13.1.tar.gz
+fedora-release-notes-13.2.tar.gz
Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-13/fedora-release-notes.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- fedora-release-notes.spec 12 May 2010 02:18:34 -0000 1.44
+++ fedora-release-notes.spec 23 May 2010 20:01:06 -0000 1.45
@@ -1,20 +1,15 @@
# Documentation Specfile
-Name: fedora-release-notes
-Version: 13.1
-Release: 2%{?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
+Name: fedora-release-notes
+Version: 13.2
+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
%description
These are the official Release Notes for Fedora 13,
written and edited by the Fedora community. For more
@@ -36,43 +31,65 @@ mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir
#
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}/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}/
+ #
+ # 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
+ mkdir -p ${NOTETARG}/images/16x16
+ mkdir -p ${NOTETARG}/images/16x16/apps
+ install -m 644 ${SRCBASE}/images/16x16/apps/*.png \
+ ${NOTETARG}/images/16x16/apps/
+ echo "${NOTETARG}/" >> html.lang
+ echo "${NOTETARG}/" >> html.lang
+ mkdir -p ${NOTETARG}/images/22x22
+ mkdir -p ${NOTETARG}/images/22x22/apps
+ install -m 644 ${SRCBASE}/images/22x22/apps/*.png \
+ ${NOTETARG}/images/22x22/apps/
+ echo "${NOTETARG}/" >> html.lang
+ echo "${NOTETARG}/" >> html.lang
+ mkdir -p ${NOTETARG}/images/48x48
+ mkdir -p ${NOTETARG}/images/48x48/apps
+ install -m 644 ${SRCBASE}/images/48x48/apps/*.png \
+ ${NOTETARG}/images/48x48/apps/
+ echo "${NOTETARG}/" >> html.lang
+ echo "${NOTETARG}/" >> html.lang
+ mkdir -p ${NOTETARG}/images/32x32
+ mkdir -p ${NOTETARG}/images/32x32/apps
+ install -m 644 ${SRCBASE}/images/32x32/apps/*.png \
+ ${NOTETARG}/images/32x32/apps/
+ echo "${NOTETARG}/" >> html.lang
+ echo "${NOTETARG}/" >> html.lang
+ mkdir -p ${NOTETARG}/images/24x24
+ mkdir -p ${NOTETARG}/images/24x24/apps
+ install -m 644 ${SRCBASE}/images/24x24/apps/*.png \
+ ${NOTETARG}/images/24x24/apps/
+ echo "${NOTETARG}/" >> html.lang
+ echo "${NOTETARG}/" >> html.lang
+ install -m 644 ${SRCBASE}/images/*.svg ${NOTETARG}/images/
+ 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
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
#
@@ -83,39 +100,50 @@ install -m 644 index.html $RPM_BUILD_ROO
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
+#
+# Icons
+#
+ICONDIR="$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/"
+mkdir -p ${ICONDIR}/scalable/apps
+install -m 644 document/en-US/images/icon.svg \
+ ${ICONDIR}/scalable/apps/fedora-documentation.svg
+for SZ in icons/* ; do
+ SZA=${SZ#icons/}
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${SZA}/apps
+ install -m 644 ${SZ}/apps/fedora-documentation.png \
+ ${ICONDIR}/${SZA}/apps/fedora-documentation.png
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi
-touch --no-create /usr/share/icons/hicolor
+ 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 || :
+ 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
+ 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 || :
+ gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || :
fi
+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
@@ -123,9 +151,20 @@ if [ -x /usr/bin/update-desktop-database
%{_defaultdocdir}/HTML
%{_datadir}/applications/fedora-release-notes.desktop
%{_datadir}/applications/kde4/fedora-release-notes.desktop
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/16x16/apps/fedora-documentation.png
+%{_datadir}/icons/hicolor/22x22/apps/fedora-documentation.png
+%{_datadir}/icons/hicolor/24x24/apps/fedora-documentation.png
+%{_datadir}/icons/hicolor/32x32/apps/fedora-documentation.png
+%{_datadir}/icons/hicolor/48x48/apps/fedora-documentation.png
+%{_datadir}/icons/hicolor/scalable/apps/fedora-documentation.svg
%changelog
+* Sun May 23 2010 John J. McDonough <jjmcd at fedoraproject.org> - 13.2-1
+- BZ#591694 Admonition on location bar in Nautilus
+- BZ#594466 Remove reference to modprobe whitelist (not implemented)
+- BZ#593639 Added Hebrew translation
+- BZ#592222 Character encoding in .desktop file
+
* Tue May 11 2010 Paul W. Frields <stickster at gmail.com> - 13.1-2
- Release bump to resolve CVS tag error
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-13/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources 11 May 2010 15:41:50 -0000 1.32
+++ sources 23 May 2010 20:01:06 -0000 1.33
@@ -1 +1 @@
-2feaf2f5066facad8d5e527b2d720df8 fedora-release-notes-13.1.tar.gz
+8c5d8ea2b3a6fef5bc1a4ece352a9392 fedora-release-notes-13.2.tar.gz
More information about the scm-commits
mailing list