diff --git a/Fedora-Legal-README.txt b/Fedora-Legal-README.txt deleted file mode 100644 index 8fbe7e9..0000000 --- a/Fedora-Legal-README.txt +++ /dev/null @@ -1,38 +0,0 @@ -= Source Availability = - -A complete machine-readable copy of the source code corresponding to -portions of the accompanying Fedora @@VERSION@@ release is available upon -request. This offer is valid to anyone in receipt of this information -and shall expire three years following the date of the final -distribution of this release by Red Hat, Inc. - -To obtain such source code, send a check or money order in the amount of -US $10.00 to: - -Fedora Legal c/o Red Hat, Inc. | 1801 Varsity Drive | Raleigh, NC 27606 -USA -Please write "source for Fedora @@VERSION@@" in the memo line of your payment. - -You may also access a copy of this source code at: -http://dl.fedoraproject.org/pub/fedora/linux/releases/@@VERSION@@/Everything/source/ - -= Export Regulations = - -By downloading or installing Fedora software, you acknowledge that you -understand all of the following: Fedora software and technical information may -be subject to the U.S. Export Administration Regulations (the “EAR”) and other -U.S. and foreign laws and may not be exported, re-exported or transferred (a) -to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of -the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any -prohibited destination or to any end user who has been prohibited from -participating in U.S. export transactions by any federal agency of the U.S. -government; or (c) for use in connection with the design, development or -production of nuclear, chemical or biological weapons, or rocket systems, space -launch vehicles, or sounding rockets, or unmanned air vehicle systems. You may -not download Fedora software or technical information if you are located in one -of these countries or otherwise subject to these restrictions. You may not -provide Fedora software or technical information to individuals or entities -located in one of these countries or otherwise subject to these restrictions. -You are also responsible for compliance with foreign law requirements -applicable to the import, export and use of Fedora software and technical -information. diff --git a/fedora-release.spec b/fedora-release.spec index 7ca0bd4..8f1c26d 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -4,12 +4,11 @@ Summary: Fedora release files Name: fedora-release Version: 18 -Release: 0.5 +Release: 0.6 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org -Source0: %{name}-%{version}.tar.bz2 -Source1: Fedora-Legal-README.txt +Source: %{name}-%{version}.tar.bz2 Obsoletes: redhat-release Provides: redhat-release Provides: system-release = %{version}-%{release} @@ -31,7 +30,6 @@ This package provides the rawhide repo definitions. %prep %setup -q -cp %{SOURCE1} . sed -i 's|@@VERSION@@|%{dist_version}|g' Fedora-Legal-README.txt %build @@ -117,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 06 2012 Dennis Gilmore - 18-0.6 +- sync up from dist-git +- replace the fedora 18 gpg keys +- bring the Fedora-Legal-README file into upstream + * Thu Jul 19 2012 Fedora Release Engineering - 18-0.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index e74187a..477d342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6582c6b3b6a99fc51e67a20a0c11058 fedora-release-18.tar.bz2 +be8649e176fc448a8f88cf592d12a97f fedora-release-18.tar.bz2