[fedora-productimg-server] BR python2-devel so the install class goes to the right place

Adam Williamson adamwill at fedoraproject.org
Thu Feb 26 05:58:01 UTC 2015


commit 2594c805c5143c40b9f11715cf846cce717343a7
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Feb 25 21:57:47 2015 -0800

    BR python2-devel so the install class goes to the right place

 fedora-productimg-server.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/fedora-productimg-server.spec b/fedora-productimg-server.spec
index 2c126d0..f780c13 100644
--- a/fedora-productimg-server.spec
+++ b/fedora-productimg-server.spec
@@ -3,7 +3,7 @@
 
 Name:           fedora-productimg-server
 Version:        22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Installer branding and configuration for Fedora Server
 
 # Copyright and related rights waived via CC0
@@ -13,7 +13,7 @@ License:        CC0
 Source0:        fedora-server.css
 Source1:        fedora-server.py
 
-BuildRequires:  cpio, findutils, xz
+BuildRequires:  cpio, findutils, xz, python2-devel
 
 Provides:       lorax-product-server
 Conflicts:      fedora-productimg-workstation, fedora-productimg-cloud
@@ -33,8 +33,8 @@ install -m 755 -d %{buildroot}%{pixmaptarget}
 
 install -m 644 %{SOURCE0} %{buildroot}%{pixmaptarget}/../
 
-mkdir -p %{buildroot}%{_datadir}/lorax/product/%{python_sitearch}/pyanaconda/installclasses
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/lorax/product/%{python_sitearch}/pyanaconda/installclasses
+mkdir -p %{buildroot}%{_datadir}/lorax/product/%{python2_sitearch}/pyanaconda/installclasses
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/lorax/product/%{python2_sitearch}/pyanaconda/installclasses
 
 ln -sf %{pixmapsource}/sidebar-bg.png %{buildroot}%{pixmaptarget}
 ln -sf %{pixmapsource}/topbar-bg.png %{buildroot}%{pixmaptarget}
@@ -55,7 +55,7 @@ popd
 %files
 %dir %{_datadir}/lorax/product/usr/share/anaconda
 %{_datadir}/lorax/product/usr/share/anaconda/fedora-server.css
-%{_datadir}/lorax/product/%{python_sitearch}/pyanaconda/installclasses/fedora-server.py*
+%{_datadir}/lorax/product/%{python2_sitearch}/pyanaconda/installclasses/fedora-server.py*
 %dir %{_datadir}/lorax/product/usr/share
 %dir %{_datadir}/lorax/product/usr
 %dir %{pixmaptarget}
@@ -64,6 +64,9 @@ popd
 %{_datadir}/fedora-productimg/product.img
 
 %changelog
+* Wed Feb 25 2015 Adam Williamson <awilliam at redhat.com> - 22-7
+- BuildRequire python2-devel so the install class goes to the right place
+
 * Tue Jan 27 2015 Stephen Gallagher <sgallagh at redhat.com> 22-6
 - Create a Fedora Server InstallClass object to modify the installer defaults.
 - Install the CSS in the proper location so that it can be merged in rather


More information about the scm-commits mailing list