Attachment 948750 Details for Bug 1154235 – generic-release.spec diff

generic-release.spec diff

diff (text/plain), 5.27 KB, created by Adam Williamson on 2014-10-20 21:58:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Williamson

Created: 2014-10-20 21:58:27 UTC

Size: 5.27 KB

patch

obsolete

>diff --git a/generic-release.spec b/generic-release.spec
>index d4b306e..8d6c68a 100644
>--- a/generic-release.spec
>+++ b/generic-release.spec
>@@ -4,7 +4,7 @@
> Summary:	Generic release files
> Name:		generic-release
> Version:	21
>-Release:	5
>+Release:	6
> License:	MIT
> Group:		System Environment/Base
> Source:		%{name}-%{version}.tar.gz
>@@ -13,7 +13,8 @@ Provides:	redhat-release
> Provides:	system-release
> Provides:	system-release(release) = %{version}
> # Comment this out if we're building for a non-rawhide target
>-Requires:	generic-release-rawhide = %{version}-%{release}
>+#Requires:	generic-release-rawhide = %{version}-%{release}
>+Requires:	system-release-product
> BuildArch:	noarch
> Conflicts:	fedora-release
> 
>@@ -23,6 +24,71 @@ define the release. This package explicitly is a replacement for the
> trademarked release package, if you are unable for any reason to abide by the 
> trademark restrictions on that release package.
> 
>+%package nonproduct
>+Summary:        Base package for non-product-specific default configurations
>+Provides:       system-release-nonproduct
>+Provides:       system-release-nonproduct(%{version})
>+Provides:       system-release-product
>+# turned out to be a bad name
>+Requires:       generic-release = %{version}-%{release}
>+Conflicts:      generic-release-cloud
>+Conflicts:      generic-release-server
>+Conflicts:      generic-release-workstation
>+
>+%description nonproduct
>+Provides a base package for non-product-specific configuration files to
>+depend on.
>+
>+%package cloud
>+Summary:        Base package for Cloud-specific default configurations
>+Provides:       system-release-cloud
>+Provides:       system-release-cloud(%{version})
>+Provides:       system-release-product
>+Requires:       generic-release = %{version}-%{release}
>+Conflicts:      generic-release-server
>+Conflicts:      generic-release-nonproduct
>+Conflicts:      generic-release-workstation
>+
>+%description cloud
>+Provides a base package for Cloud-specific configuration files to
>+depend on.
>+
>+%package server
>+Summary:        Base package for Server-specific default configurations
>+Provides:       system-release-server
>+Provides:       system-release-server(%{version})
>+Provides:       system-release-product
>+Requires:       generic-release = %{version}-%{release}
>+Requires:       systemd
>+Requires:       cockpit
>+Requires:       rolekit
>+Requires(post):	sed
>+Requires(post):	systemd
>+Conflicts:      generic-release-cloud
>+Conflicts:      generic-release-nonproduct
>+Conflicts:      generic-release-workstation
>+
>+%description server
>+Provides a base package for Server-specific configuration files to
>+depend on.
>+
>+%package workstation
>+Summary:        Base package for Workstation-specific default configurations
>+Provides:       system-release-workstation
>+Provides:       system-release-workstation(%{version})
>+Provides:       system-release-product
>+Requires:       generic-release = %{version}-%{release}
>+Conflicts:      generic-release-cloud
>+Conflicts:      generic-release-server
>+Conflicts:      generic-release-nonproduct
>+# needed for captive portal support
>+Requires:       NetworkManager-config-connectivity-fedora
>+
>+
>+%description workstation
>+Provides a base package for Workstation-specific configuration files to
>+depend on.
>+
> %package rawhide
> Summary:        Rawhide repo definitions
> Requires:	generic-release = %{version}-%{release}
>@@ -65,10 +131,10 @@ ln -s fedora-release $RPM_BUILD_ROOT/etc/system-release
> 
> cat << EOF >>$RPM_BUILD_ROOT/etc/os-release
> NAME=Generic
>-VERSION="%{version} (%{release_name})"
>+VERSION="%{dist_version} (%{release_name})"
> ID=generic
>-VERSION_ID=%{version}
>-PRETTY_NAME="Generic %{version} (%{release_name})"
>+VERSION_ID=%{dist_version}
>+PRETTY_NAME="Generic %{dist_version} (%{release_name})"
> ANSI_COLOR="0;34"
> CPE_NAME="cpe:/o:generic:generic:%{version}"
> EOF
>@@ -101,6 +167,20 @@ install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
> cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
> # dist macros.
> 
>+# Add Product-specific presets
>+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
>+# Fedora Server
>+install -m 0644 80-server.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/
>+
>+%post server
>+if [ $1 -eq 1 ] ; then
>+        # Initial installation; fix up after %%systemd_post in packages
>+	# possibly installed before our preset file was added
>+	units=$(sed -n 's/^enable//p' \
>+		< %{_prefix}/lib/systemd/system-preset/80-server.preset)
>+        /usr/bin/systemctl preset $units >/dev/null 2>&1 || :
>+fi
>+
> %%fedora		%{dist_version}
> %%dist		.fc%{dist_version}
> %%fc%{dist_version}		1
>@@ -134,7 +214,27 @@ rm -rf $RPM_BUILD_ROOT
> %defattr(-,root,root,-)
> %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
> 
>+%files nonproduct
>+%{!?_licensedir:%global license %%doc}
>+%license LICENSE
>+
>+%files cloud
>+%{!?_licensedir:%global license %%doc}
>+%license LICENSE
>+
>+%files server
>+%{!?_licensedir:%global license %%doc}
>+%license LICENSE
>+%{_prefix}/lib/systemd/system-preset/80-server.preset
>+
>+%files workstation
>+%{!?_licensedir:%global license %%doc}
>+%license LICENSE
>+
> %changelog
>+* Mon Oct 20 2014 Adam Williamson <awilliam@redhat.com> - 21-6
>+- synchronize with fedora-release for Product changes
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 21-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View

Attachments on bug 1154235: 948750