[rpms/fedora-release] f45: Revert "Rename fedora-release-standard to fedora-release-nonproduct following discussion on list and irc"

[rpms/fedora-release] f45: Revert "Rename fedora-release-standard to fedora-release-nonproduct following discussion on list and irc"

[Ray Strode]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 8a7e722ea1dc992feefed5de250981158d396637
            Author : Ray Strode <rstrode@redhat.com>
            Date   : 2014-10-06T10:27:53-04:00
            Stats  : +9/-16 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/8a7e722ea1dc992feefed5de250981158d396637?branch=f45

            Log:
            Revert "Rename fedora-release-standard to fedora-release-nonproduct following discussion on list and irc"

This reverts commit 4494ccab3d6dfd6abe25b11c43a98db9b2c2efff.

Reverted following more discussion to wait for dgilmore to chime in.

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 1e83609..d14625d 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        22
-Release:        0.7
+Release:        0.6
 License:        MIT
 Group:          System Environment/Base
 URL:            http://fedoraproject.org
@@ -20,19 +20,16 @@ BuildArch:      noarch
 %description
 Fedora release files such as various /etc/ files that define the release.
 
-%package nonproduct
+%package standard
 Summary:        Base package for non-product-specific default configurations
-Provides:       system-release-nonproduct
-Provides:       system-release-nonproduct(%{version})
-# turned out to be a bad name
-Provides:       fedora-release-standard = 22-0.7
-Obsoletes:      fedora-release-standard < 22-0.7
+Provides:       system-release-standard
+Provides:       system-release-standard(%{version})
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-cloud
 Conflicts:      fedora-release-server
 Conflicts:      fedora-release-workstation
 
-%description nonproduct
+%description standard
 Provides a base package for non-product-specific configuration files to
 depend on.
 
@@ -42,7 +39,7 @@ Provides:       system-release-cloud
 Provides:       system-release-cloud(%{version})
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-server
-Conflicts:      fedora-release-nonproduct
+Conflicts:      fedora-release-standard
 Conflicts:      fedora-release-workstation
 
 %description cloud
@@ -60,7 +57,7 @@ Requires:       rolekit
 Requires(post):	sed
 Requires(post):	systemd
 Conflicts:      fedora-release-cloud
-Conflicts:      fedora-release-nonproduct
+Conflicts:      fedora-release-standard
 Conflicts:      fedora-release-workstation
 
 %description server
@@ -74,7 +71,7 @@ Provides:       system-release-workstation(%{version})
 Requires:       fedora-release = %{version}-%{release}
 Conflicts:      fedora-release-cloud
 Conflicts:      fedora-release-server
-Conflicts:      fedora-release-nonproduct
+Conflicts:      fedora-release-standard
 # needed for captive portal support
 Requires:       NetworkManager-config-connectivity-fedora
 
@@ -157,7 +154,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 nonproduct
+%files standard
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 
@@ -175,10 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %license LICENSE
 
 %changelog
-* Mon Oct 06 2014 Ray Strode <rstrode@redhat.com> 22-0.7
-- Rename fedora-release-standard to fedora-release-nonproduct
-  following discussion on list and irc
-
 * Tue Sep 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 22-0.6
 - Add requires for captive portal to Workstation