[rpms/fedora-release] f45: Merge #91 `revert 8befd03`

[rpms/fedora-release] f45: Merge #91 `revert 8befd03`

[Stephen Gallagher]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : a570f8af04e79e50c49fff3d7bf5a3eae5cc2322
            Author : Stephen Gallagher <sgallagh@fedoraproject.org>
            Date   : 2019-08-13T10:20:36+00:00
            Stats  : +18/-15 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/a570f8af04e79e50c49fff3d7bf5a3eae5cc2322?branch=f45

            Log:
            Merge #91 `revert 8befd03`

Signed-off-by: Stephen Gallagher <sgallagh@fedoraproject.org>

---
diff --git a/80-workstation.preset b/80-workstation.preset
index 9444a20..7e250fb 100644
--- a/80-workstation.preset
+++ b/80-workstation.preset
@@ -13,7 +13,3 @@ disable sshd.service
 enable cups.socket
 enable cups.path
 disable cups.service
-
-# enable zram swap by default on workstation
-# https://bugzilla.redhat.com/show_bug.cgi?id=1731598
-enable zram-swap.service

diff --git a/Fedora-Legal-README.txt b/Fedora-Legal-README.txt
index 6ef77b6..8f61c37 100644
--- a/Fedora-Legal-README.txt
+++ b/Fedora-Legal-README.txt
@@ -1,15 +1,16 @@
 = License =
 
-Fedora is a compilation of software packages, each under its own
-license.  The compilation itself is released under the MIT license
-(see the file LICENSE). However, this compilation license does not
-supersede the licenses of code and content contained in Fedora, which
-conform to the legal guidelines described at
+The Fedora Operating System is a compilation of software packages, 
+each under its own license. The compilation itself is released 
+under the MIT license (see the file LICENSE). However, this 
+compilation license does not supersede the licenses of code and 
+content contained in the Fedora Operating System, which conform 
+to the legal guidelines described at
 https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing.
 
 = Source Availability =
 
-The accompanying Fedora 29 release includes copyrighted
+The accompanying Fedora 31 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
@@ -17,10 +18,10 @@ money order in the amount of US $5.00 to:
 
 VP, Legal - Products & Technologies | Red Hat, Inc. | 100 East Davie Street | Raleigh, NC 27601 USA
 
-Please write "source for Fedora 29" in the memo line of your payment.
+Please write "source for Fedora 31" 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/29/Everything/source/
+http://dl.fedoraproject.org/pub/fedora/linux/releases/31/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

diff --git a/fedora-release.spec b/fedora-release.spec
index 21e1fd2..4a8fb13 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1,5 +1,5 @@
 %define release_name Rawhide
-%define dist_version 31
+%define dist_version 32
 %define bug_version rawhide
 
 # Change this when branching to fNN
@@ -13,8 +13,8 @@
 
 Summary:        Fedora release files
 Name:           fedora-release
-Version:        31
-Release:        0.8
+Version:        32
+Release:        0.1
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -642,6 +642,12 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 
 
 %changelog
+* Tue Aug 13 2019 Mohan Boddu <mboddu@bhujji.com> - 32-0.1
+- Setup for rawhide being F32
+
+* Sat Aug 10 2019 Tom Callaway <spot@fedoraproject.org> - 31-0.9
+- update legal text (reflect current release, refer to Fedora OS instead of Fedora)
+
 * Sat Jul 13 2019 Colin Walters <walters@verbum.org> - 31-0.8
 - Sync Silverblue with Workstation
   In particular, it should have the same "ssh disabled by default" etc.