rpms/fedora-release-notes/F-11 .cvsignore, 1.19, 1.20 fedora-release-notes.spec, 1.37, 1.38 import.log, 1.3, 1.4 sources, 1.29, 1.30

Jesse Keating jkeating at fedoraproject.org
Tue May 12 01:34:47 UTC 2009


Author: jkeating

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

Modified Files:
	.cvsignore fedora-release-notes.spec import.log sources 
Log Message:
Import the latest from upstream (yes this removes the hardlink, upstream still
not sure on that).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	21 Apr 2009 20:40:12 -0000	1.19
+++ .cvsignore	12 May 2009 01:34:17 -0000	1.20
@@ -1,6 +1,6 @@
-README-10.93.0.tar.gz
-README-BURNING-ISOS-10.93.0.tar.gz
-about-fedora-10.93.0.tar.gz
-fedora-release-notes-10.93.0.tar.gz
-homepage-10.93.0.tar.gz
-readme-live-image-10.93.0.tar.gz
+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


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/fedora-release-notes.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- fedora-release-notes.spec	29 Apr 2009 19:11:49 -0000	1.37
+++ fedora-release-notes.spec	12 May 2009 01:34:17 -0000	1.38
@@ -10,10 +10,10 @@
 %endif
 
 Name:		fedora-release-notes
-Version:	10.93.0
-Release:	2%{?dist}
+Version:	11.0.0
+Release:	1%{?dist}
 Summary:	Release Notes for Fedora 11
-URL:		http://fedoraproject.org/wiki/Docs/Beats
+URL:		http://fedoraproject.org/wiki/Documentation_Beats
 
 Group:		System Environment/Base
 License:	Open Publication
@@ -29,7 +29,6 @@ BuildArch:	noarch
 BuildRequires:	desktop-file-utils
 BuildRequires:	publican
 BuildRequires:	publican-fedora
-BuildRequires:	hardlink
 
 %if %{HTMLVIEW}
 Requires:	htmlview
@@ -41,7 +40,7 @@ Requires:	xdg-utils
 # 7.90.0-1, but we do not want to burden yum upgraders or respinners
 # unnecessarily.
 Provides:	indexhtml = %{version}-%{release}
-Obsoletes:	indexhtml < 9-3
+Obsoletes:	indexhtml < 10-3
 
 Provides:	system-release-notes = %{version}-%{release}
 
@@ -62,7 +61,7 @@ http://fedoraproject.org/wiki/Docs/Beats
 
 
 %build
-%{__make} html-desktop-all
+%{__make} html-single-all
 %{__make} xml-all
 
 
@@ -80,7 +79,7 @@ for LANGDIR in tmp/* ; do
   #
   # Place where html files are
   LANG=${LANGDIR#tmp/}
-  SRCBASE=tmp/${LANG}/html-desktop
+  SRCBASE=tmp/${LANG}/html-single
   # Target for release notes html
   NOTETARG=$RPM_BUILD_ROOT%{_defaultdocdir}/HTML/%{name}/${LANG}
   mkdir -p ${NOTETARG}
@@ -149,10 +148,6 @@ install -m 644 about-*omf $RPM_BUILD_ROO
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 popd
 
-# There are lot of duplicate files, save space by hardlinking them
-hardlink -cv $RPM_BUILD_ROOT%{_datadir}/doc
-hardlink -cv $RPM_BUILD_ROOT%{_datadir}/gnome
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -179,8 +174,8 @@ if [ -x /usr/bin/update-desktop-database
 
 
 %changelog
-* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 10.93.0-2
-- Hardlink duplicate files to save space
+* Thu May  7 2009 John J. McDonough <jjmcd at fedoraproject.org> - 11.0.0-1
+- Update for Fedora 11 release candidate
 
 * Tue Apr 14 2009 John J. McDonough <jjmcd at fedoraproject.org> - 10.93.0-1
 - Use publican for F11 Preview release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Apr 2009 20:40:12 -0000	1.3
+++ import.log	12 May 2009 01:34:17 -0000	1.4
@@ -1,3 +1,4 @@
 fedora-release-notes-9_92-3:HEAD:fedora-release-notes-9.92-3.src.rpm:1225277926
 fedora-release-notes-10_0_0-0_1:HEAD:fedora-release-notes-10.0.0-0.1.src.rpm:1226107703
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	21 Apr 2009 20:40:12 -0000	1.29
+++ sources	12 May 2009 01:34:17 -0000	1.30
@@ -1,6 +1,6 @@
-95c56c8400816c5739a795bbaeb7998c  README-10.93.0.tar.gz
-4d6df8b91cdef65482c2e12b551b525e  README-BURNING-ISOS-10.93.0.tar.gz
-1f10f301845d8666a64f86faaf3f910d  about-fedora-10.93.0.tar.gz
-5dbf898ad4d8074e47ce86bcb6dada4d  fedora-release-notes-10.93.0.tar.gz
-3a313db11a49705079a4cca80b3b41a1  homepage-10.93.0.tar.gz
-bd081a3b4df49a10b67c7b02912fc164  readme-live-image-10.93.0.tar.gz
+cc4e31251ea8256ba379bdc87dc3f477  README-11.0.0.tar.gz
+d106140583e709dfefc18dc6ec5be52a  README-BURNING-ISOS-11.0.0.tar.gz
+f73527dad0fdc7fba8b088c46e33d25e  about-fedora-11.0.0.tar.gz
+f18b4b4a09c5c5b9adff0ba9fb0c94b0  fedora-release-notes-11.0.0.tar.gz
+17e32ca09453ab42c125b4a371e4c623  homepage-11.0.0.tar.gz
+63e65b3e27e5d4c0353b5a3a6f2c4ffc  readme-live-image-11.0.0.tar.gz




More information about the fedora-extras-commits mailing list