[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2297: Fix png12 handling of "devel" versions (5.1 in this case).

Jeff Licquia licquia at linuxfoundation.org
Tue Sep 30 20:43:20 UTC 2014


------------------------------------------------------------
revno: 2297
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2014-09-30 16:43:20 -0400
message:
  Fix png12 handling of "devel" versions (5.1 in this case).
modified:
  package/Makefile
  package/lsb-build.spec.sed
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2014-09-26 15:14:50 +0000
+++ b/package/Makefile	2014-09-30 20:43:20 +0000
@@ -50,7 +50,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-BUILDNO=1
+BUILDNO=2
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'package/lsb-build.spec.sed'
--- a/package/lsb-build.spec.sed	2014-09-17 22:57:44 +0000
+++ b/package/lsb-build.spec.sed	2014-09-30 20:43:20 +0000
@@ -109,7 +109,7 @@
 #( for v in 3.1 3.2 4.0 4.1; do cd $RPM_BUILD_ROOT/opt/lsb/%xlib-$v && ln -s libpng12.so libpng.so; done )
 #( for v in 5.0 5.1; do if [ -d $RPM_BUILD_ROOT/opt/lsb/%xlib-$v ]; then cd $RPM_BUILD_ROOT/opt/lsb/%xlib-$v && ln -s libpng15.so libpng.so; fi; done )
 # replacement for versionlist-driven linkinge
-( for v in 3.1 3.2 4.0 4.1 5.0 5.1; do cd $RPM_BUILD_ROOT/opt/lsb/%xlib-$v && ln -s libpng12.so libpng.so; done )
+( for v in 3.1 3.2 4.0 4.1 5.0 5.1; do if [ -d $RPM_BUILD_ROOT/opt/lsb/%xlib-$v ]; then cd $RPM_BUILD_ROOT/opt/lsb/%xlib-$v && ln -s libpng12.so libpng.so; fi; done )
 
 # specifics for cc part:
 mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-build-cc



More information about the lsb-messages mailing list