rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.265, 1.266 policycoreutils.spec, 1.352, 1.353

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28175

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Dec 20 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-8
- Remove hard coding of python2.4 from Makefiles


policycoreutils-rhat.patch:
 Makefile                        |    2 
 audit2allow/Makefile            |    2 
 audit2allow/avc.py              |    2 
 gui/Makefile                    |   30 
 gui/booleansPage.py             |  199 ++
 gui/fcontextPage.py             |  158 ++
 gui/loginsPage.py               |  161 ++
 gui/mappingsPage.py             |   54 
 gui/modulesPage.py              |  161 ++
 gui/portsPage.py                |  214 +++
 gui/selinux.tbl                 |  265 +++
 gui/semanagePage.py             |  109 +
 gui/statusPage.py               |  213 +++
 gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++
 gui/system-config-selinux.py    |  156 ++
 gui/translationsPage.py         |  109 +
 gui/usersPage.py                |  155 ++
 load_policy/load_policy.c       |   10 
 newrole/newrole.c               |    4 
 po/Makefile                     |    2 
 restorecond/restorecond.c       |   12 
 restorecond/restorecond.conf    |    1 
 semanage/Makefile               |    2 
 semanage/semanage               |   28 
 semanage/semanage.8             |    5 
 semanage/seobject.py            |   39 
 26 files changed, 4857 insertions(+), 39 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- policycoreutils-rhat.patch	19 Dec 2006 14:09:47 -0000	1.265
+++ policycoreutils-rhat.patch	20 Dec 2006 18:21:01 -0000	1.266
@@ -10,6 +10,18 @@
  			first = True
  			for i in m:
  				if file != i[1]:
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.33.6/audit2allow/Makefile
+--- nsapolicycoreutils/audit2allow/Makefile	2006-11-16 17:14:29.000000000 -0500
++++ policycoreutils-1.33.6/audit2allow/Makefile	2006-12-20 13:18:16.000000000 -0500
+@@ -4,7 +4,7 @@
+ LIBDIR ?= $(PREFIX)/lib
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+-PYLIBVER ?= python2.4
++PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
+ PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ 
+ TARGETS=audit2allow
 diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.6/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-1.33.6/gui/booleansPage.py	2006-12-08 10:34:48.000000000 -0500
@@ -4949,6 +4961,18 @@
  /etc/samba/secrets.tdb
  /etc/mtab
  /var/run/utmp
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.33.6/semanage/Makefile
+--- nsapolicycoreutils/semanage/Makefile	2006-11-16 17:14:26.000000000 -0500
++++ policycoreutils-1.33.6/semanage/Makefile	2006-12-20 13:17:58.000000000 -0500
+@@ -3,7 +3,7 @@
+ LIBDIR ?= $(PREFIX)/lib
+ SBINDIR ?= $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/share/man
+-PYLIBVER ?= python2.4
++PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
+ PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ 
+ TARGETS=semanage
 diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.6/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2006-11-16 17:14:26.000000000 -0500
 +++ policycoreutils-1.33.6/semanage/semanage	2006-12-19 08:56:35.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- policycoreutils.spec	19 Dec 2006 14:09:48 -0000	1.352
+++ policycoreutils.spec	20 Dec 2006 18:21:02 -0000	1.353
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.33.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -168,6 +168,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Dec 20 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-8
+- Remove hard coding of python2.4 from Makefiles
+
 * Tue Dec 19 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-7
 - add exists switch to semanage to tell it not to check for existance of Linux user
 Resolves: #219421