[Lsb-messages] /var/www/bzr/lsb/4.0/appbat r844: Fix libbat file locations, s390x

Stew Benedict stewb at linux-foundation.org
Tue Jun 19 14:15:33 UTC 2012


------------------------------------------------------------
revno: 844
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Tue 2012-06-19 10:15:33 -0400
message:
  Fix libbat file locations, s390x
renamed:
  desktop/celestia.xml => desktop/celestia.xml.in
modified:
  configure.in
  libs/curl.xml.in
  libs/freeglut.xml.in
  libs/libart_lgpl.xml.in
  libs/readline.xml.in
  libs/tiff.xml.in
-------------- next part --------------
=== modified file 'configure.in'
--- a/configure.in	2012-06-10 15:47:47 +0000
+++ b/configure.in	2012-06-19 14:15:33 +0000
@@ -204,4 +204,4 @@
 	AC_MSG_ERROR(resolve warnings above and check config.log)
 fi
 
-AC_OUTPUT(entities/general extras/entitypath.py rpm/rpmmacros rpm/rpmrc rpm/libbat.spec appbat.xml desktop.xml appbat-extra.xml desktop/xpaint.xml desktop/scribus.xml desktop/transmission.xml desktop/pidgin.xml)
+AC_OUTPUT(entities/general extras/entitypath.py rpm/rpmmacros rpm/rpmrc rpm/libbat.spec appbat.xml desktop.xml appbat-extra.xml desktop/celestia.xml desktop/xpaint.xml desktop/scribus.xml desktop/transmission.xml desktop/pidgin.xml)

=== renamed file 'desktop/celestia.xml' => 'desktop/celestia.xml.in'
=== modified file 'libs/curl.xml.in'
--- a/libs/curl.xml.in	2012-06-08 11:18:30 +0000
+++ b/libs/curl.xml.in	2012-06-19 14:15:33 +0000
@@ -41,7 +41,7 @@
 			<configure>
 			    <base>&build_dir;/&curl-directory;</base>
 			    <param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
-			    <param>--libdir=/opt/lsb/lib64</param>
+			    <param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib64</param>
 			    <param>--disable-shared</param>
 			    <param>--without-ssl</param>
 			    <param>--without-libssh2</param>
@@ -59,6 +59,7 @@
 			<configure>
 			    <base>&build_dir;/&curl-directory;</base>
 			    <param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+			    <param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib</param>
 			    <param>--disable-shared</param>
 			    <param>--without-ssl</param>
 			    <param>--without-libssh2</param>

=== modified file 'libs/freeglut.xml.in'
--- a/libs/freeglut.xml.in	2012-06-08 11:18:30 +0000
+++ b/libs/freeglut.xml.in	2012-06-19 14:15:33 +0000
@@ -32,7 +32,7 @@
 			<configure>
 				<base>&build_dir;/&freeglut-directory;</base>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
-				<param>--libdir=/opt/lsb/lib64</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib64</param>
 			   	<param>--x-libraries=/opt/lsb/lib64</param>
 			   	<param>--x-includes=/opt/lsb/include/X11</param>
 				<param>--disable-shared</param>
@@ -45,6 +45,7 @@
 			<configure>
 				<base>&build_dir;/&freeglut-directory;</base>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib</param>
 			   	<param>--x-libraries=/opt/lsb/lib</param>
 			   	<param>--x-includes=/opt/lsb/include/X11</param>
 				<param>--disable-shared</param>

=== modified file 'libs/libart_lgpl.xml.in'
--- a/libs/libart_lgpl.xml.in	2012-06-08 11:18:30 +0000
+++ b/libs/libart_lgpl.xml.in	2012-06-19 14:15:33 +0000
@@ -35,7 +35,7 @@
 			<configure>
 				<base>&build_dir;/&libart-lgpl-directory;</base>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
-				<param>--libdir=/opt/lsb/lib64</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib64</param>
 				<param>--disable-shared</param>
 				<param>--with-pic</param>
 			</configure>
@@ -45,6 +45,7 @@
 			<configure>
 				<base>&build_dir;/&libart-lgpl-directory;</base>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib</param>
 				<param>--disable-shared</param>
 				<param>--with-pic</param>
 			</configure>

=== modified file 'libs/readline.xml.in'
--- a/libs/readline.xml.in	2012-06-08 11:18:30 +0000
+++ b/libs/readline.xml.in	2012-06-19 14:15:33 +0000
@@ -32,10 +32,10 @@
 				<base>&build_dir;/&readline-directory;</base>
 				<param>CFLAGS="-fPIC -g -O2"</param>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib64</param>
 				<param>--disable-shared</param>
 				<param>--enable-static</param>
 				<param>--with-curses</param>
-				<param>--libdir=/opt/lsb/lib64</param>
 			</configure>
 		   </lib64>
 
@@ -44,6 +44,7 @@
 				<base>&build_dir;/&readline-directory;</base>
 				<param>CFLAGS="-fPIC -g -O2"</param>
 				<param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+				<param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib</param>
 				<param>--disable-shared</param>
 				<param>--enable-static</param>
 				<param>--with-curses</param>

=== modified file 'libs/tiff.xml.in'
--- a/libs/tiff.xml.in	2012-06-08 11:18:30 +0000
+++ b/libs/tiff.xml.in	2012-06-19 14:15:33 +0000
@@ -40,7 +40,7 @@
 			<configure>
 			    <base>&build_dir;/&tiff-directory;</base>
 			    <param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
-			    <param>--libdir=/opt/lsb/lib64</param>
+			    <param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib64</param>
 			    <param>--with-ZIP=yes --with-DIR_GZLIB=/usr/lib</param>
 			    <param>--with-JPEG=yes</param>
 			    <param>--disable-cxx</param>
@@ -60,6 +60,7 @@
 			<configure>
 			    <base>&build_dir;/&tiff-directory;</base>
 			    <param>--prefix=/opt/lsb/libbat/@APPBATVERSION@</param>
+			    <param>--libdir=/opt/lsb/libbat/@APPBATVERSION@/lib</param>
 			    <param>--with-ZIP=yes --with-DIR_GZLIB=/usr/lib</param>
 			    <param>--with-JPEG=yes</param>
 			    <param>--disable-cxx</param>



More information about the lsb-messages mailing list