rpms/fedora-release-notes/F-11 .cvsignore, 1.20, 1.21 fedora-release-notes.spec, 1.39, 1.40 import.log, 1.5, 1.6 sources, 1.31, 1.32

Eric Christensen sparks at fedoraproject.org
Sun Jan 3 16:22:36 UTC 2010 

Author: sparks

Update of /cvs/pkgs/rpms/fedora-release-notes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30903/F-11

Modified Files:
	.cvsignore fedora-release-notes.spec import.log sources 
Log Message:
Changes:
- bugs 505607, 511933, 505665, 508832, 506344
- Some additional languages are translated
- Now have a menu icon for KDE with language selection
   (previously HTML was available if you could find it)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	12 May 2009 01:34:17 -0000	1.20
+++ .cvsignore	3 Jan 2010 16:22:35 -0000	1.21
@@ -1,6 +1,6 @@
-README-11.0.0.tar.gz
-README-BURNING-ISOS-11.0.0.tar.gz
-about-fedora-11.0.0.tar.gz
-fedora-release-notes-11.0.0.tar.gz
-homepage-11.0.0.tar.gz
-readme-live-image-11.0.0.tar.gz
+README-11.0.4.tar.gz
+README-BURNING-ISOS-11.0.4.tar.gz
+about-fedora-11.0.4.tar.gz
+fedora-release-notes-11.0.4.tar.gz
+homepage-11.0.4.tar.gz
+readme-live-image-11.0.4.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/fedora-release-notes.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- fedora-release-notes.spec	14 May 2009 04:23:56 -0000	1.39
+++ fedora-release-notes.spec	3 Jan 2010 16:22:35 -0000	1.40
@@ -10,8 +10,8 @@
 %endif
 
 Name:		fedora-release-notes
-Version:	11.0.0
-Release:	2%{?dist}
+Version:	11.0.4
+Release:	1%{?dist}
 Summary:	Release Notes for Fedora 11
 URL:		http://fedoraproject.org/wiki/Documentation_Beats
 
@@ -61,25 +61,30 @@ http://fedoraproject.org/wiki/Docs/Beats
 
 
 %build
-%{__make} html-single-all
-%{__make} xml-all
+# Koji currently has Publican 1.0
+#%{__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}
+# Base index.html
+install -m 644 html/index.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}
+install -m 644 -D fedora-release-notes.desktop \
+    $RPM_BUILD_ROOT%{_datadir}/applications/kde4/fedora-release-notes.desktop
 
 #
 # Loop through the languages
 #
-for LANGDIR in tmp/* ; do
+for LANGDIR in xml/* ; do
   #
   # First, the html in /usr/share/doc/HTML
   #
   # Place where html files are
-  LANG=${LANGDIR#tmp/}
-  SRCBASE=tmp/${LANG}/html-single
+  LANG=${LANGDIR#xml/}
+  SRCBASE=html/${LANG}
   # Target for release notes html
   NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
   mkdir -p ${NOTETARG}
@@ -87,15 +92,17 @@ for LANGDIR in tmp/* ; do
   mkdir -p ${NOTETARG}/Common_Content
   mkdir -p ${NOTETARG}/Common_Content/css
   mkdir -p ${NOTETARG}/Common_Content/images
+  install -m 644 ${SRCBASE}/Common_Content/css/* \
+      ${NOTETARG}/Common_Content/css
+  install -m 644 ${SRCBASE}/Common_Content/images/* \
+      ${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
+  SRCBASE=xml/${LANG}
   # gnome-help target for xml files
   HELPTARG=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}/${LANG}
   mkdir -p ${HELPTARG}
@@ -106,9 +113,11 @@ for LANGDIR in tmp/* ; 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
+  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
+  install -m 644 ${SRCBASE}/Common_Content/images/* \
+      ${HELPTARG}/Common_Content/images
   for F in ${SRCBASE}/*.xml ; do
     install -m 644 ${F} ${HELPTARG}/
   done
@@ -147,6 +156,31 @@ install -m 755 -d $RPM_BUILD_ROOT%{_data
 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
+#
+# Install the icons for KDE
+#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/16x16
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/16x16/apps
+install -m 644 icons/frn16.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/16x16/apps/fedora-release-notes.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/32x32
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/32x32/apps
+install -m 644 icons/frn32.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/32x32/apps/fedora-release-notes.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/48x48
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/48x48/apps
+install -m 644 icons/frn48.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/48x48/apps/fedora-release-notes.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/64x64
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/64x64/apps
+install -m 644 icons/frn64.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/64x64/apps/fedora-release-notes.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/128x128
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/128x128/apps
+install -m 644 icons/frn128.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/oxygen/128x128/apps/fedora-release-notes.png
 
 
 %clean
@@ -168,12 +202,42 @@ if [ -x /usr/bin/update-desktop-database
 %{_datadir}/gnome/help/about-fedora/
 %{_datadir}/gnome/help/fedora-release-notes/
 %{_datadir}/applications/about-fedora.desktop
+%{_datadir}/applications/kde4/fedora-release-notes.desktop
 %{_datadir}/omf/fedora-release-notes/
 %{_datadir}/omf/about-fedora/
+%{_datadir}/icons/oxygen/
 
 
 
 %changelog
+* Fri Jan 01 2010 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.4-1
+- Remove untranslated languages
+
+* Fri Jan 01 2010 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.3-10
+- Try including relative symlink instead of symlinking on the fly
+
+* Wed Dec 30 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.3-7
+- Link Common_Content instead of duplicating
+
+* Tue Dec 29 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.3-3
+- Updated icon, missing "C" omf file
+
+* Tue Dec 29 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.3-2
+- Add .desktop file for kde
+
+* Mon Dec 28 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.3-1
+- 505607 cf5199d41d04b7b59f707cf3e40ec5a7ea9d520c Correct domain name div.isc.org
+- 511933 936c5a77f9fd75a536e03c3dd72d79291d8ed012 Incorrect URL in virtualization
+- 505665 666c8e083695243217a7de2325c8ec008dcd1313 Correct duplicate entry for pm_utils
+- 508832 184912af296e9128f1e0347c22beeff0bd92c8c5 Changes to printing
+- 506344 1f797539067473b9dae3c61ce2738bb64df7c2dc Correct missing "mailto" in feedback link
+
+* 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
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	14 May 2009 04:23:56 -0000	1.5
+++ import.log	3 Jan 2010 16:22:35 -0000	1.6
@@ -3,3 +3,4 @@ fedora-release-notes-10_0_0-0_1:HEAD:fed
 fedora-release-notes-10_93_0-1_fc10:F-11:fedora-release-notes-10.93.0-1.fc10.src.rpm:1240345993
 fedora-release-notes-11_0_0-1_fc10:F-11:fedora-release-notes-11.0.0-1.fc10.src.rpm:1242091912
 fedora-release-notes-11_0_0-2_fc11:F-11:fedora-release-notes-11.0.0-2.fc11.src.rpm:1242274979
+fedora-release-notes-11_0_4-1_fc10:F-11:fedora-release-notes-11.0.4-1.fc10.src.rpm:1262535604


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	14 May 2009 04:23:56 -0000	1.31
+++ sources	3 Jan 2010 16:22:35 -0000	1.32
@@ -1,6 +1,6 @@
-b00ee726cffba6351a3e65da60d87262  README-11.0.0.tar.gz
-a5cb23316654d561a13f86aed7b29248  README-BURNING-ISOS-11.0.0.tar.gz
-ab5c00c1695d08c563ea7d8195e17efc  about-fedora-11.0.0.tar.gz
-c9314714af60e52155b1ead1a6f1368e  fedora-release-notes-11.0.0.tar.gz
-a12cff86fb17a32e2124aa62f51f6963  homepage-11.0.0.tar.gz
-b541878fdf06694a4494e42bbfada179  readme-live-image-11.0.0.tar.gz
+08a24a44df30ad37e83bff4170a1cf77  README-11.0.4.tar.gz
+45c5d27078b55460c8442b2b62f33bfa  README-BURNING-ISOS-11.0.4.tar.gz
+3d6b58c11f6000cb0c43cfbfea8ed88c  about-fedora-11.0.4.tar.gz
+1537269ca9667355b367c2a7564cde74  fedora-release-notes-11.0.4.tar.gz
+71ff149e8bfc83ad7db59cef0c05c895  homepage-11.0.4.tar.gz
+891dbf5f987a82de8f7f8608b38df74b  readme-live-image-11.0.4.tar.gz

More information about the fedora-extras-commits mailing list