rpms/fedora-release-notes/F-7 .cvsignore, 1.10, 1.11 fedora-release-notes.spec, 1.19, 1.20 sources, 1.19, 1.20

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6521/F-7

Modified Files:
	.cvsignore fedora-release-notes.spec sources 
Log Message:
Import 7.0.0-1 SRPM for dist-fc7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Apr 2007 02:05:16 -0000	1.10
+++ .cvsignore	22 May 2007 03:12:58 -0000	1.11
@@ -1,5 +1,5 @@
-README-6.93.tar.gz
-README-BURNING-ISOS-6.93.tar.gz
-about-fedora-6.93.tar.gz
-fedora-release-notes-6.93.tar.gz
-homepage-6.93.tar.gz
+README-7.0.0.tar.gz
+README-BURNING-ISOS-7.0.0.tar.gz
+about-fedora-7.0.0.tar.gz
+fedora-release-notes-7.0.0.tar.gz
+homepage-7.0.0.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-7/fedora-release-notes.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fedora-release-notes.spec	24 Apr 2007 00:50:00 -0000	1.19
+++ fedora-release-notes.spec	22 May 2007 03:12:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
-Version:	6.93
-Release:	2
+Version:	7.0.0
+Release:	1
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -19,7 +19,7 @@
 Obsoletes:	indexhtml < 9-3
 
 %description 
-These are the official Release Notes for Fedora %{version},
+These are the official Release Notes for Fedora 7,
 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
@@ -61,11 +61,14 @@
 install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
 popd
 pushd about-fedora-%{version}
-find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{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
+pushd ghelp
+find -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/fedora-release-notes/{} \;
+popd
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
 install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/%{name}/
 
@@ -75,7 +78,7 @@
 
 
 %post
-if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q -o %{_datadir}/omf/{%{name},about-fedora}; fi
+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
@@ -86,13 +89,23 @@
 %files
 %defattr(-,root,root,-)
 %{_defaultdocdir}/HTML
-%{_defaultdocdir}/fedora-release-notes-%{version}/
+%{_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/
 
 
 %changelog
+* Thu May 10 2007 Paul W. Frields <stickster at gmail.com> - 7.0.0-1
+- Fix fedora-release-notes to use yelp ghelp facility
+- Fix post script to properly update scrollkeeper
+- Build for F7
+
+* Fri Apr 27 2007 Paul W. Frields <stickster at gmail.com> - 6.93-3
+- Relocate about-fedora and use yelp's ghelp: facility (#208220)
+- Fix distro name in OMF and document metadata
+
 * Mon Apr 23 2007 Jesse Keating <jkeating at redhat.com> - 6.93-2
 - Updated translations and bits from wiki
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Apr 2007 00:50:00 -0000	1.19
+++ sources	22 May 2007 03:12:58 -0000	1.20
@@ -1,5 +1,5 @@
-9c05429b1c4a9b339882cceef79cd44a  README-6.93.tar.gz
-701daf646d52f106c27679df6b86442d  README-BURNING-ISOS-6.93.tar.gz
-e371adf0f9874080135709d1559712d0  about-fedora-6.93.tar.gz
-88676b6f67e9bd208d04499b2bf2f81f  fedora-release-notes-6.93.tar.gz
-7931717c29560d9fea6425369dfcf8fd  homepage-6.93.tar.gz
+e137d2f6421e2de557473a852cc054c1  README-7.0.0.tar.gz
+82ecc5752e9e828f537985260c4a8fde  README-BURNING-ISOS-7.0.0.tar.gz
+b7cf1632e35feae7c1aaa725dfe2f6ce  about-fedora-7.0.0.tar.gz
+c0e36e9954e1905dce9cb1828e1fd513  fedora-release-notes-7.0.0.tar.gz
+77877e3ae1488c81a88f0b5206530dd4  homepage-7.0.0.tar.gz