[Lsb-messages] /var/www/bzr/lsb/devel/appbat r1023: lsb-python.spec: fix ordering problem in defining %{lib}

[Mats Wichmann]

------------------------------------------------------------
revno: 1023
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: appbat
timestamp: Fri 2017-04-14 09:13:24 -0600
message:
  lsb-python.spec: fix ordering problem in defining %{lib}
modified:
  rpm/lsb-build-libbat.spec
  rpm/lsb-python.spec
-------------- next part --------------
=== modified file 'rpm/lsb-build-libbat.spec'
--- a/rpm/lsb-build-libbat.spec	2013-09-26 17:06:33 +0000
+++ b/rpm/lsb-build-libbat.spec	2017-04-14 15:13:24 +0000
@@ -27,7 +27,8 @@
 %define gccmakedep_ver 1.0.2
 %define xorgcf_ver 1.0.3
 %define libxaw_ver 1.0.7
-%define freeglut_ver 2.4.0
+#%define freeglut_ver 2.4.0
+%define freeglut_ver 3.0.0
 %define openssl_ver 0.9.7m
 %define bzip2_ver 1.0.5
 %define readline_ver 6.0 
@@ -70,7 +71,7 @@
 Patch7: libXp-%{libxp_ver}.patch
 Patch10: xorg-cf-files-%{xorgcf_ver}.patch
 Patch11: libXaw-%{libxaw_ver}.patch
-Patch13: freeglut-%{freeglut_ver}.patch
+#Patch13: freeglut-%{freeglut_ver}.patch
 Patch14: openssl-%{openssl_ver}.patch
 Patch15: bzip2-%{bzip2_ver}.patch
 Patch16: readline-%{readline_ver}.patch
@@ -112,7 +113,7 @@
 %patch11 -p0 -b .lsbcc
 
 # freeglut
-%patch13 -p0 -b .lsbcc
+#%patch13 -p0 -b .lsbcc
 
 # openssl
 %patch14 -p0 -b .lsbcc

=== modified file 'rpm/lsb-python.spec'
--- a/rpm/lsb-python.spec	2013-09-26 17:06:33 +0000
+++ b/rpm/lsb-python.spec	2017-04-14 15:13:24 +0000
@@ -32,9 +32,6 @@
 
 %build
 # common environment settings
-# building for 3.1, but we may need some libbat bits
-export CC="lsbcc -L/opt/lsb/libbat/%{appbatversion}/%{lib} -I/opt/lsb/libbat/%{appbatversion}/include"
-export CXX="lsbc++ -L/opt/lsb/libbat/%{appbatversion}/%{lib} -I/opt/lsb/libbat/%{appbatversion}/include"
 %define prefix /opt/lsb
 %define app_prefix %{prefix}/appbat
 %define bindir %{app_prefix}/bin
@@ -53,6 +50,10 @@
 # build as a 3.1 compliant app
 export LSBCC_LSBVERSION=3.1
 
+# building for 3.1, but we may need some libbat bits
+export CC="lsbcc -L/opt/lsb/libbat/%{appbatversion}/%{lib} -I/opt/lsb/libbat/%{appbatversion}/include"
+export CXX="lsbc++ -L/opt/lsb/libbat/%{appbatversion}/%{lib} -I/opt/lsb/libbat/%{appbatversion}/include"
+
 # this build wants this set - reason unknown
 export LDSHARED="lsbcc -shared"