[fedora-release/f21] Rename fedora-release-standard to fedora-release-nonproduct

[Dennis Gilmore]

commit 55cd03497379fe4ba49b200ecaee673e4b489c43
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Oct 16 18:50:48 2014 -0500

    Rename fedora-release-standard to fedora-release-nonproduct
    
      following discussion on list and irc

 fedora-release.spec |   33 ++++++++++++++++++++++++---------
 sources             |    2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 8fa3a5b..0c40652 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        21
-Release:        0.14
+Release:        0.16
 License:        MIT
 Group:          System Environment/Base
 URL:            http://fedoraproject.org
@@ -15,21 +15,26 @@ Provides:       redhat-release
 Provides:       system-release
 Provides:       system-release(%{version})
 Requires:       fedora-repos(%{version})
+Requires:       system-release-product
 BuildArch:      noarch
 
 %description
 Fedora release files such as various /etc/ files that define the release.
 
-%package standard
+%package nonproduct
 Summary:        Base package for non-product-specific default configurations
-Provides:       system-release-standard
-Provides:       system-release-standard(%{version})
+Provides:       system-release-nonproduct
+Provides:       system-release-nonproduct(%{version})
+Provides:       system-release-product
+# turned out to be a bad name
+Provides:       fedora-release-standard = 21-0.16
+Obsoletes:      fedora-release-standard < 21-0.16
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-cloud
 Conflicts:      fedora-release-server
 Conflicts:      fedora-release-workstation
 
-%description standard
+%description nonproduct
 Provides a base package for non-product-specific configuration files to
 depend on.
 
@@ -37,9 +42,10 @@ depend on.
 Summary:        Base package for Fedora Cloud-specific default configurations
 Provides:       system-release-cloud
 Provides:       system-release-cloud(%{version})
+Provides:       system-release-product
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-server
-Conflicts:      fedora-release-standard
+Conflicts:      fedora-release-nonproduct
 Conflicts:      fedora-release-workstation
 
 %description cloud
@@ -50,6 +56,7 @@ depend on.
 Summary:        Base package for Fedora Server-specific default configurations
 Provides:       system-release-server
 Provides:       system-release-server(%{version})
+Provides:       system-release-product
 Requires:       fedora-release = %{version}-%{release}
 Requires:       systemd
 Requires:       cockpit
@@ -57,7 +64,7 @@ Requires:       rolekit
 Requires(post):	sed
 Requires(post):	systemd
 Conflicts:      fedora-release-cloud
-Conflicts:      fedora-release-standard
+Conflicts:      fedora-release-nonproduct
 Conflicts:      fedora-release-workstation
 
 %description server
@@ -68,10 +75,11 @@ depend on.
 Summary:        Base package for Fedora Workstation-specific default configurations
 Provides:       system-release-workstation
 Provides:       system-release-workstation(%{version})
+Provides:       system-release-product
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-cloud
 Conflicts:      fedora-release-server
-Conflicts:      fedora-release-standard
+Conflicts:      fedora-release-nonproduct
 # needed for captive portal support
 Requires:       NetworkManager-config-connectivity-fedora
 
@@ -154,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
 
-%files standard
+%files nonproduct
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 
@@ -172,6 +180,13 @@ rm -rf $RPM_BUILD_ROOT
 %license LICENSE
 
 %changelog
+* Mon Oct 06 2014 Ray Strode <rstrode at redhat.com> 21-0.16
+- Rename fedora-release-standard to fedora-release-nonproduct
+  following discussion on list and irc
+
+* Fri Oct 03 2014 Stephen Gallagher <sgallagh at redhat.com> 21-0.15
+- Add system-release-product virtual Provides and Requires
+
 * Tue Sep 30 2014 Josh Boyer <jwboyer at fedoraproject.org> - 21-0.14
 - Add requires for captive portal to Workstation
 
diff --git a/sources b/sources
index 5151462..c884570 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f737cd4d76a023862e5abd4a308df95  fedora-release-21.tar.bz2
+32e2b36d76b9f317eb3db2a32f5f2d8e  fedora-release-21.tar.bz2