rpms/libselinux/devel .cvsignore, 1.102, 1.103 libselinux-rhat.patch, 1.75, 1.76 libselinux.spec, 1.183, 1.184 sources, 1.104, 1.105

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29814

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
	* Merged Makefile PYLIBVER definition patch from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	17 Mar 2006 17:20:57 -0000	1.102
+++ .cvsignore	11 Apr 2006 18:25:46 -0000	1.103
@@ -77,3 +77,4 @@
 libselinux-1.29.7.tgz
 libselinux-1.29.8.tgz
 libselinux-1.30.tgz
+libselinux-1.30.1.tgz

libselinux-rhat.patch:
 selinuxswig.i |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libselinux-rhat.patch	17 Mar 2006 17:20:57 -0000	1.75
+++ libselinux-rhat.patch	11 Apr 2006 18:25:46 -0000	1.76
@@ -1,11 +1,22 @@
---- libselinux-1.29.7/src/Makefile~	2006-01-20 10:37:52.000000000 -0500
-+++ libselinux-1.29.7/src/Makefile	2006-03-16 17:22:52.000000000 -0500
-@@ -3,7 +3,7 @@
- LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
--PYLIBVER ?= python2.4
-+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
- PYINC ?= /usr/include/$(PYLIBVER)
- PYLIB ?= /usr/lib/$(PYLIBVER)
- PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
++++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:23:41.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	$1 = &temp;
+ }
+ %typemap(argout) security_context_t * {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
++%typedef unsigned mode_t;
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
+@@ -114,6 +115,6 @@
+ }
+ 
+ %typemap(argout) char ** {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- libselinux.spec	17 Mar 2006 18:33:18 -0000	1.183
+++ libselinux.spec	11 Apr 2006 18:25:46 -0000	1.184
@@ -2,7 +2,7 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30
+Version: 1.30.1
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -111,6 +111,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
+
 * Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1
 - Make some fixes so it will build on RHEL4
 - Upgrade to latest from NSA


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	17 Mar 2006 17:20:57 -0000	1.104
+++ sources	11 Apr 2006 18:25:46 -0000	1.105
@@ -1 +1 @@
-b0834c79eac17c87c690542b0874cc53  libselinux-1.30.tgz
+16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz