#185 Restore the VERSION substitution in the legal readme
Closed 3 years ago by sgallagh. Opened 3 years ago by bcotton.
rpms/ bcotton/fedora-release fix_legal_txt  into  rawhide

file modified
+3 -3
@@ -10,7 +10,7 @@ 

  

  = Source Availability =

  

- The accompanying Fedora 31 release includes copyrighted

+ The accompanying Fedora Linux @@VERSION@@ release includes copyrighted

  software that is licensed under the GNU General Public License and

  other licenses. You may obtain the complete machine-readable source

  code corresponding to portions of this release by sending a check or
@@ -18,10 +18,10 @@ 

  

  VP, Legal - Products & Technologies | Red Hat, Inc. | 100 East Davie Street | Raleigh, NC 27601 USA

  

- Please write "source for Fedora 31" in the memo line of your payment.

+ Please write "source for Fedora Linux @@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/31/Everything/source/

+ https://dl.fedoraproject.org/pub/fedora/linux/releases/@@VERSION@@/Everything/source/

  

  This offer is valid to anyone in receipt of this information and shall

  expire three years following the date of the final distribution of

file modified
+4 -1
@@ -60,7 +60,7 @@ 

  Summary:        Fedora release files

  Name:           fedora-release

  Version:        35

- Release:        0.7%{?eln:.eln%{eln}}

+ Release:        0.8%{?eln:.eln%{eln}}

  License:        MIT

  URL:            https://fedoraproject.org/

  
@@ -1328,6 +1328,9 @@ 

  

  

  %changelog

+ * Fri Apr 30 2021 Ben Cotton <bcotton@fedoraproject.org> - 35-0.8

+ - Automatically set the version in Fedora-Legal-README.txt

+ 

  * Tue Apr 13 2021 Timothée Ravier <travier@redhat.com> - 35-0.7

  - Add ostree-counting & ostree-desktop subpackages

  

This doesn't quite work perfectly, in that the the URL for rawhide won't
work. But that's enough of an edge case that it's not a blocker.

Also changed http:// to https:// because it's 2021.

This PR replaces #184

Signed-off-by: Ben Cotton bcotton@fedoraproject.org

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Lets hold off merging until we check with legal that everything is still ok here.

I'm not a fan of sed for this, but I won't fight it too hard...

Specifically, I'm checking to make sure the mail offer information is still correct.

Lets hold off merging until we check with legal that everything is still ok here.

I'm not a fan of sed for this, but I won't fight it too hard...

I just merged it, along with the PRETTY_NAME patch...

If Legal has a problem with it, we can change it again.

Pull-Request has been closed by sgallagh

3 years ago