rpms/fedora-release-notes/devel fedora-release-notes.spec,1.39,1.40

[Paul W. Frields]

Author: pfrields

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

Modified Files:
	fedora-release-notes.spec 
Log Message:
Update spec file for F-13 GA


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- fedora-release-notes.spec	5 Apr 2010 17:59:43 -0000	1.39
+++ fedora-release-notes.spec	3 May 2010 23:30:36 -0000	1.40
@@ -1,17 +1,20 @@
 # Documentation Specfile
 
 Name:		fedora-release-notes
-Version:	12.0.95
-Release:	4%{?dist}
+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
+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
-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
@@ -31,6 +34,7 @@ mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir
 #
 # Loop through the languages
 #
+cat /dev/null > html.lang
 for LANGDIR in document/* ; do
   #
   # First, the html in /usr/share/doc/HTML, then descend
@@ -42,20 +46,33 @@ for LANGDIR in document/* ; do
   NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
   # Place where html files are
   SRCBASE=${LANGDIR}
-  mkdir -p ${NOTETARG}
   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/*.png \
-        ${NOTETARG}/Common_Content/images/
   install -m 644 ${SRCBASE}/Common_Content/images/*.svg \
-        ${NOTETARG}/Common_Content/images/
+	${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/
+	${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
 #
@@ -66,19 +83,43 @@ 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
+desktop-file-validate \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/fedora-release-notes.desktop
+desktop-file-validate \
+  ${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; 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
@@ -86,8 +127,22 @@ 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/*
 
 %changelog
+* Mon May  3 2010 Paul W. Frields <stickster at gmail.com> - 13-1
+- Update for F13 GA release
+- Add icons for hicolor theme per XDG
+
+* 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