rpms/sblim-cmpi-samba/devel import.log, NONE, 1.1 sblim-cmpi-samba-0.2.3-model.patch, NONE, 1.1 sblim-cmpi-samba-0.5.2-1769647-release.patch, NONE, 1.1 sblim-cmpi-samba-0.5.2-include.patch, NONE, 1.1 sblim-cmpi-samba.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

vcrhonek vcrhonek at fedoraproject.org
Thu Oct 22 12:59:43 UTC 2009


Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29570/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-samba-0.2.3-model.patch 
	sblim-cmpi-samba-0.5.2-1769647-release.patch 
	sblim-cmpi-samba-0.5.2-include.patch sblim-cmpi-samba.spec 
Log Message:
Initial import (#502834).


--- NEW FILE import.log ---
sblim-cmpi-samba-0_5_2-1_fc10:HEAD:sblim-cmpi-samba-0.5.2-1.fc10.src.rpm:1256216289

sblim-cmpi-samba-0.2.3-model.patch:
 Linux_Samba.mof |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-samba-0.2.3-model.patch ---
--- model/Linux_Samba.mof       2007-08-17 13:02:57.000000000 +0200
+++ model/Linux_Samba.mof       2007-08-17 13:03:03.000000000 +0200
@@ -178,7 +178,7 @@
     string Path;
 
     [Write]
-    boolean Printable = "yes";
+    boolean Printable = true;
 
     [Write]
     string SystemPrinterName;

sblim-cmpi-samba-0.5.2-1769647-release.patch:
 ChangeLog                                               |   17 
 NEWS                                                    |    4 
 resource-access/scripts/smt_smb_ra_get_user_mappings.py |   25 
 resource-access/scripts/smt_smb_ra_parser.py            |  486 !!!!!!!!!!!!!!!!
 resource-access/smt_smb_ra_support.c                    |   12 
 sblim-cmpi-samba.spec.in                                |    8 
 6 files changed, 25 insertions(+), 2 deletions(-), 525 modifications(!)

--- NEW FILE sblim-cmpi-samba-0.5.2-1769647-release.patch ---
Index: sblim-cmpi-samba.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/sblim-cmpi-samba.spec.in,v
retrieving revision 1.20
diff -c -r1.20 sblim-cmpi-samba.spec.in
*** sblim-cmpi-samba.spec.in	14 Sep 2007 12:30:33 -0000	1.20
--- sblim-cmpi-samba.spec.in	6 Dec 2007 17:06:39 -0000
***************
*** 9,15 ****
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 1
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
--- 9,15 ----
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 2
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
***************
*** 20,26 ****
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides: cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
--- 20,26 ----
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides:	 cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
***************
*** 171,176 ****
--- 171,180 ----
  
  ###############################################################################
  %changelog
+ * Tue Oct 16 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-2
+   - Inclusion of fixes for the following issues:
+     o 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  * Fri Sep 14 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-1
    - Inclusion of fixes for the following issues:
      o 1794679  cmpi-samba: base tests on current delivered testsuite
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/NEWS,v
retrieving revision 1.16
diff -c -r1.16 NEWS
*** NEWS	14 Sep 2007 12:27:50 -0000	1.16
--- NEWS	6 Dec 2007 17:06:39 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ Changes on top of 0.5.2-1
+ ==============================================================================
+ - 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  Changes in 0.5.2-1
  ==============================================================================
  - 1794679  cmpi-samba: base tests on current delivered testsuite
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/ChangeLog,v
retrieving revision 1.11
diff -c -r1.11 ChangeLog
*** ChangeLog	14 Sep 2007 12:41:33 -0000	1.11
--- ChangeLog	6 Dec 2007 17:06:39 -0000
***************
*** 1,4 ****
--- 1,21 ----
  // =========================================================================
+ // Changes on top of version 0.5.2-1 :
+ 
+ 2007-12-06 10:56  skanan
+ 
+ 	* NEWS, sblim-cmpi-samba.spec.in (BRANCH_0_5_2_1): Fix for issue:
+ 	  [1769647]  Parallel requests cause provider to quit
+ 
+ 2007-12-05 12:18  skanan
+ 
+ 	* resource-access/smt_smb_ra_support.c, NEWS,
+ 	  sblim-cmpi-samba.spec.in,
+ 	  resource-access/scripts/smt_smb_ra_get_user_mappings.py,
+ 	  resource-access/scripts/smt_smb_ra_parser.py (BRANCH_0_5_2_1):
+ 	  Fix for issue: [1769647]  Parallel requests cause provider to
+ 	  quit
+ 
+ // =========================================================================
  // new in version 0.5.2-1 :
  
  2007-09-14 14:30  taphorn
Index: resource-access/scripts/smt_smb_ra_parser.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_parser.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_parser.py
*** resource-access/scripts/smt_smb_ra_parser.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_parser.py	6 Dec 2007 17:06:41 -0000
***************
*** 1,240 ****
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
! 		self.file = file(self.filename)
! 		self.tokens = {}
! 		self.sec_order = [] # These 2 exists basically to allow us to determine the
! 		self.all_order = {} # order in wich the shares appear in the file.  
! 		for i in self.file.xreadlines():
! 			if self.comment.search(i):
! 				continue
! 			try:
! 				sh = self.share.search(strip(i)).groups()[0]
! 				self.tokens[sh] = {} 
! 				self.sec_order.append(sh)
! 				self.all_order[sh] = []
! 			except AttributeError:
! 				try:
! 					op = self.opts.search(strip(i)).groups()
! 					self.tokens[sh][op[0]] = op[1]
! 					self.all_order[sh].append(op[0])
! 				except:
! 					continue
! 			except:
! 				continue
! 		self.file.close()		
! 		return self.tokens
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
--- 1,246 ----
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! from os import write,close,path
! from sys import argv,exit,stdin
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
!         	if path.exists(self.filename):
! 
! 			self.file = file(self.filename)
! 			self.tokens = {}
! 			self.sec_order = [] # These 2 exists basically to allow us to determine the
! 			self.all_order = {} # order in wich the shares appear in the file.  
! 			for i in self.file.xreadlines():
! 				if self.comment.search(i):
! 					continue
! 				try:
! 					sh = self.share.search(strip(i)).groups()[0]
! 					self.tokens[sh] = {} 
! 					self.sec_order.append(sh)
! 					self.all_order[sh] = []
! 				except AttributeError:
! 					try:
! 						op = self.opts.search(strip(i)).groups()
! 						self.tokens[sh][op[0]] = op[1]
! 						self.all_order[sh].append(op[0])
! 					except:
! 						continue
! 				except:
! 					continue
! 			self.file.close()		
! 			return self.tokens
! 		else:
! 			exit(EINVAL)
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
Index: resource-access/scripts/smt_smb_ra_get_user_mappings.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_get_user_mappings.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_get_user_mappings.py
*** resource-access/scripts/smt_smb_ra_get_user_mappings.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_get_user_mappings.py	6 Dec 2007 17:06:41 -0000
***************
*** 18,24 ****
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close
  from smt_smb_ra_errors import *
  import re
  
--- 18,24 ----
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close,path
  from smt_smb_ra_errors import *
  import re
  
***************
*** 41,60 ****
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
-       
-     def parse(self):
  
!         f = open(self.fname,"r")
  
!         for line in f.readlines():
  
!             if self.comment.search(line): continue
!             elif self.valid.search(line):
!                 (k,v) = line.split("=")
!                 self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!             else:
!                 write(pipeid,"EOF\n")
!                 exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
--- 41,61 ----
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
  
!     def parse(self):
! 	if path.exists(self.fname):
!             f = open(self.fname,"r")
  
!             for line in f.readlines():
  
!                 if self.comment.search(line): continue
!                 elif self.valid.search(line):
!                     (k,v) = line.split("=")
!                     self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!                 else:
!                     exit(EINVAL)
! 	else:
!     	    exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
Index: resource-access/smt_smb_ra_support.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/smt_smb_ra_support.c,v
retrieving revision 1.10
diff -c -r1.10 smt_smb_ra_support.c
*** resource-access/smt_smb_ra_support.c	14 Sep 2007 12:07:01 -0000	1.10
--- resource-access/smt_smb_ra_support.c	6 Dec 2007 17:06:41 -0000
***************
*** 1789,1798 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("yes",printable) ||
! 	!strcasecmp(GLOBAL,all_services[i]) ) continue;
!     shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!     shares_list[j++] = strdup(all_services[i]);
    }
  
    shares_list[j] = (char *) NULL;
--- 1789,1800 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (strcasecmp(GLOBAL,all_services[i]) && (!printable || !strcasecmp("no",printable))) {
!         shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!         shares_list[j++] = strdup(all_services[i]);
!     } else {
!         continue;
!     }
    }
  
    shares_list[j] = (char *) NULL;
***************
*** 1900,1906 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }
--- 1902,1908 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp(GLOBAL,all_services[i]) || !printable || !strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }

sblim-cmpi-samba-0.5.2-include.patch:
 Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp           |    1 +
 Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp               |    1 +
 Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp             |    1 +
 Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp                 |    1 +
 Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp         |    1 +
 Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp         |    1 +
 Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp                                         |    1 +
 Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp                           |    1 +
 Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp                       |    1 +
 Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp |    2 ++
 Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp       |    1 +
 Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp         |    2 ++
 Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp           |    1 +
 Linux_SambaUser/Linux_SambaUserResourceAccess.cpp                                           |    1 +
 support/smt_smb_array.cpp                                                                   |    3 +++
 18 files changed, 25 insertions(+)

--- NEW FILE sblim-cmpi-samba-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:38.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp	2009-02-17 16:38:49.000000000 +0100
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old	2009-02-17 16:43:45.000000000 +0100
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp	2009-02-17 16:48:11.000000000 +0100
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:43.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp	2009-02-17 16:53:22.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:44.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp	2009-02-17 16:58:00.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old	2007-08-27 10:18:52.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp	2009-02-17 17:05:31.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalPrintingForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:18:53.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp	2009-02-17 16:01:22.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaGlobalPrintingOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp	2009-02-17 17:12:31.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp	2009-02-17 16:04:48.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaGlobalSecurityOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old	2007-08-27 10:18:57.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp	2009-02-17 17:18:27.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaGroupForUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old	2007-08-27 10:18:56.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp	2009-02-17 16:26:09.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaGroupResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old	2007-08-27 10:19:09.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp	2009-02-17 16:09:25.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaPrinterOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old	2007-08-27 10:19:11.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp	2009-02-17 17:29:37.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaPrinterPrintingForPrinterResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:19:12.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp	2009-02-17 16:17:38.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaPrinterPrintingOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp	2009-02-17 17:40:17.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp	2009-02-17 17:48:56.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForShareResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp	2009-02-17 16:21:53.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaShareSecurityOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old	2007-08-27 10:19:26.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp	2009-02-17 16:30:26.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old	2006-07-22 16:34:26.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp	2009-02-17 15:53:00.000000000 +0100
@@ -25,6 +25,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-samba.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-samba
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Samba

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:         sblim-cmpi-samba-0.2.3-model.patch
Patch1:         sblim-cmpi-samba-0.5.2-1769647-release.patch
Patch2:         sblim-cmpi-samba-0.5.2-include.patch

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  sblim-cmpi-devel
BuildRequires:  dos2unix
Requires:       sblim-tools-libra
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       samba >= 3.0.10
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-samba = %{version}

%description
The cmpi-samba package provides access to the samba configuration data
via CIMOM technology/infrastructure.
It contains the Samba CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Samba - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM WBEM-SMT Samba Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Samba - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM WBEM-SMT Samba Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p0 -b .model
%patch1 -p0 -b .1769647-release
%patch2 -p2 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/sblim-cmpi-samba-%{_arch}.conf
dos2unix $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_smb_ra_test.py

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%doc %{_datadir}/doc/%{name}-%{version}
%{_datadir}/sblim-cmpi-samba
%{_libdir}/libRaToolsSmb.so.*
%{_libdir}/libLinux_SmbGeneralProviderBasic.so.*
%{_libdir}/libIBM_SmbProviderTooling.so.*
%exclude %{_datadir}/%{name}/*.pyc
%exclude %{_datadir}/%{name}/*.pyo
%config(noreplace) %{_sysconfdir}/smt_smb*.conf
%{_libdir}/cmpi/libcmpiLinux_Samba*.so
%{_libdir}/cmpi/libcmpiCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_smb*.h
%{_libdir}/libRaToolsSmb.so
%{_libdir}/libLinux_SmbGeneralProviderBasic.so
%{_libdir}/libIBM_SmbProviderTooling.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/system/linux/Linux_Samba*
%{_datadir}/sblim-testsuite/cim/Linux_Samba*
%{_datadir}/sblim-testsuite/xml/Linux_Samba*
%{_datadir}/sblim-testsuite/smbpasswd
%{_datadir}/sblim-testsuite/smbusers
%{_datadir}/sblim-testsuite/smb.conf
%{_datadir}/sblim-testsuite/test-cmpi-samba.sh
%{_datadir}/sblim-testsuite/test-cmpi-samba-associations.pl

# Conditional definition of schema and registration files
%define SAMBA_SCHEMA %{_datadir}/%{name}/Linux_Samba.mof
%define SAMBA_REGISTRATION %{_datadir}/%{name}/Linux_Samba.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
%{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:43:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:59:42 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-samba-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:43:49 -0000	1.1
+++ sources	22 Oct 2009 12:59:42 -0000	1.2
@@ -0,0 +1 @@
+b847d8bc53e41a7d63d4fbf5d5ddffed  sblim-cmpi-samba-0.5.2.tar.bz2




More information about the fedora-extras-commits mailing list