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

Adam Williamson adamwill at fedoraproject.org
Thu Feb 26 05:55:48 UTC 2015


commit 626c055982b03889051bca3f7fb65327def2075a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Feb 25 21:55:37 2015 -0800

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

 fedora-productimg-workstation.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/fedora-productimg-workstation.spec b/fedora-productimg-workstation.spec
index 215fa3a..908365b 100644
--- a/fedora-productimg-workstation.spec
+++ b/fedora-productimg-workstation.spec
@@ -3,7 +3,7 @@
 
 Name:           fedora-productimg-workstation
 Version:        22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Installer branding and configuration for Fedora Workstation
 
 # Copyright and related rights waived via CC0
@@ -13,7 +13,7 @@ License:        CC0
 Source0:        fedora-workstation.css
 Source1:        fedora-workstation.py
 
-BuildRequires:  cpio, findutils, xz
+BuildRequires:  cpio, findutils, xz, python2-devel
 
 Provides:       lorax-product-workstation
 Conflicts:      fedora-productimg-cloud, fedora-productimg-server
@@ -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-workstation.css
-%{_datadir}/lorax/product/%{python_sitearch}/pyanaconda/installclasses/fedora-workstation.py*
+%{_datadir}/lorax/product/%{python2_sitearch}/pyanaconda/installclasses/fedora-workstation.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
+
 * Wed Feb 18 2015 Kalev Lember <kalevlember at gmail.com> 22-6
 - Create a Fedora Workstation 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