From c417f6b8869bfb42d1055a78986516b54cbf02ab Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 14 Feb 2006 17:11:59 +0000
Subject: [PATCH] *** empty log message ***

---
 .cvsignore          |  1 +
 Makefile.devel      | 16 +++++++++-------
 selinux-policy.spec | 16 +++++++++-------
 sources             |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c2325221..317344ca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,4 @@ serefpolicy-2.2.11.tgz
 serefpolicy-2.2.12.tgz
 serefpolicy-2.2.13.tgz
 serefpolicy-2.2.14.tgz
+serefpolicy-2.2.15.tgz
diff --git a/Makefile.devel b/Makefile.devel
index 4f59b227..0a7e1598 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -1,5 +1,8 @@
+# installation paths
+SHAREDIR := $(PREFIX)/share/selinux
+HEADERDIR := $(SHAREDIR)/refpolicy/include
 
--include build.conf
+include $(HEADERDIR)/build.conf
 
 # executables
 PREFIX := /usr
@@ -8,6 +11,7 @@ SBINDIR := $(PREFIX)/sbin
 CHECKMODULE := $(BINDIR)/checkmodule
 SEMODULE := $(SBINDIR)/semodule
 SEMOD_PKG := $(BINDIR)/semodule_package
+XMLLINT := $(BINDIR)/xmllint
 
 # helper tools
 AWK ?= gawk
@@ -15,10 +19,12 @@ INSTALL ?= install
 M4 ?= m4
 SED ?= sed
 EINFO ?= echo
+PYTHON ?= python
 
-# set default build options
+# set default build options if missing
 NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
 MLSENABLED := $(shell cat /selinux/mls)
+MODPKGDIR := $(SHAREDIR)/$(NAME)
 
 ifeq ($(MLSENABLED),1)
 MCSFLAG=-mcs
@@ -27,11 +33,7 @@ endif
 TYPE ?= $(NAME)${MCSFLAG}
 DIRECT_INITRC ?= n
 POLY ?= n
-
-# installation paths
-SHAREDIR := $(PREFIX)/share/selinux
-MODPKGDIR := $(SHAREDIR)/$(NAME)
-HEADERDIR := $(SHAREDIR)/refpolicy/include
+QUIET ?= y
 
 # compile strict policy if requested.
 ifneq ($(findstring strict,$(TYPE)),)
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 2a5244f8..2d8bdc6c 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -5,8 +5,8 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.14
-Release: 2
+Version: 2.2.15
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -24,10 +24,9 @@ Source10: booleans-strict.conf
 Source11: seusers-strict
 Source12: setrans-strict.conf
 Source13: policygentool
-Source14: Makefile.devel
-Source15: users_extra-targeted
-Source16: users_extra-strict
-Source17: users_extra-mls
+Source14: users_extra-targeted
+Source15: users_extra-strict
+Source16: users_extra-mls
 
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/serefpolicy-buildroot
@@ -179,7 +178,7 @@ make clean
 make 
 make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
-install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
+ln -sf ./include/Makefile ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -298,6 +297,9 @@ SELinux Reference policy development files
 
 %changelog
 
+* Tue Feb 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.15-1
+- Update to upsteam
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh@redhat.com> 2.2.14-2
 - Add users_extra files
 
diff --git a/sources b/sources
index 350c1923..1e4c805a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b0c1f6438c0be1d7fce5c8307784e86  serefpolicy-2.2.14.tgz
+6018f8b9cf975dadf25e4051d0ed36d4  serefpolicy-2.2.15.tgz