[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2068: Make 5.0 libpng symlink conditional.

[Jeff Licquia]

------------------------------------------------------------
revno: 2068
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2013-02-11 15:21:10 -0500
message:
  Make 5.0 libpng symlink conditional.
modified:
  package/Makefile
  package/lsb-build.spec.sed
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-08 18:30:43 +0000
+++ b/package/Makefile	2013-02-11 20:21:10 +0000
@@ -46,7 +46,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
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=4
 
 # 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	2012-12-13 14:08:45 +0000
+++ b/package/lsb-build.spec.sed	2013-02-11 20:21:10 +0000
@@ -93,7 +93,7 @@
 cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-build-desktop
 cp package/README-desktop $RPM_BUILD_ROOT/opt/lsb/doc/lsb-build-desktop/README
 ( 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; do cd $RPM_BUILD_ROOT/opt/lsb/%xlib-$v && ln -s libpng15.so libpng.so; done )
+( for v in 5.0; 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 )
 
 # specifics for cc part:
 mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-build-cc