[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2302: move some bits to trial use for LSB 5.0

Mats Wichmann mats at linuxfoundation.org
Thu Jan 15 19:57:52 UTC 2015


------------------------------------------------------------
revno: 2302
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2015-01-15 12:57:52 -0700
message:
  move some bits to trial use for LSB 5.0
modified:
  lsbdev-cc/lsbcc_libs.h
  mkfilelists
  package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc_libs.h'
--- a/lsbdev-cc/lsbcc_libs.h	2014-09-17 22:40:29 +0000
+++ b/lsbdev-cc/lsbcc_libs.h	2015-01-15 19:57:52 +0000
@@ -265,7 +265,6 @@
 	"fontconfig",
 	"freetype",
 	"gcc_s",
-	"gdk-3",
 	"gdk-x11-2.0",
 	"gdk_pixbuf-2.0",
 	"gdk_pixbuf_xlib-2.0",
@@ -274,7 +273,6 @@
 	"gmodule-2.0",
 	"gobject-2.0",
 	"gthread-2.0",
-	"gtk-3",
 	"gtk-x11-2.0",
 	"jpeg",
 	"m",
@@ -357,6 +355,7 @@
 	"pangoxft-1.0",
 	"png12",
 	"png",
+	"png15",
 	"pthread",
 	"rt",
 	"sane",
@@ -437,9 +436,22 @@
 lsb_lib_modules_t lsb_modules_41[] = {
 };
 
-#define lsb_num_modules_50 0
+char *lsb_TUM_libs_50[] = {
+	"png15",
+	NULL
+};
+
+char *lsb_Toolkit_Gtk3_libs_50[] = {
+	"gdk-3",
+	"gtk-3",
+	NULL
+};
+
+#define lsb_num_modules_50 2
 
 lsb_lib_modules_t lsb_modules_50[] = {
+	{"TUM", lsb_TUM_libs_50 },
+	{"Toolkit_Gtk3", lsb_Toolkit_Gtk3_libs_50 },
 };
 
 #define lsb_num_modules_51 0

=== modified file 'mkfilelists'
--- a/mkfilelists	2014-06-27 18:06:53 +0000
+++ b/mkfilelists	2015-01-15 19:57:52 +0000
@@ -52,6 +52,7 @@
 DESKTOP_MODULES = [
     'LSB_Graphics',
     'LSB_Toolkit_Gtk',
+    'LSB_Toolkit_Gtk3',
     'LSB_Toolkit_Qt',
     'LSB_Graphics_Ext',
     'LSB_XML',

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-12-16 16:03:19 +0000
+++ b/package/Makefile	2015-01-15 19:57:52 +0000
@@ -50,11 +50,11 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.3
+SUB_VERSION=.4
 
 # 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=2
+BUILDNO=1
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list