From ea85c5f227f722e2c2b436c2b05b502aab01bee0 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Mon, 16 Feb 2009 20:33:30 +0000
Subject: [PATCH] Update to new version of mcstrans from Joe Nall

---
 .cvsignore    |  2 ++
 mcstrans.spec | 30 +++++++++++++++++++++++++-----
 sources       |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 92f5be8..3b6b728 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -19,3 +19,5 @@ mcstrans-0.2.8.tgz
 mcstrans-0.2.9.tgz
 mcstrans-0.2.10.tgz
 mcstrans-0.2.11.tgz
+mcstrans-0.3.0.6.tgz
+mcstrans-0.3.1.tgz
diff --git a/mcstrans.spec b/mcstrans.spec
index 5a20003..337f994 100644
--- a/mcstrans.spec
+++ b/mcstrans.spec
@@ -1,13 +1,14 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.2.11
-Release: 2%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.3-1
-BuildRequires: libcap-devel 
+BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static
+Requires: pcre
 Requires(pre): /sbin/chkconfig /sbin/service
 Requires(post):/sbin/chkconfig /sbin/service
 Provides: setransd
@@ -37,11 +38,15 @@ make CFLAGS="-g %{optflags}"
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_lib} 
-mkdir -p %{buildroot}/%{_libdir} 
+mkdir -p %{buildroot}/%{_lib}
+mkdir -p %{buildroot}/%{_libdir}
+mkdir -p %{buildroot}%{_usr}/share/mcstrans
+mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d
+
 make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" install
 rm -f %{buildroot}%{_sbindir}/*
 rm -f %{buildroot}%{_libdir}/*.a
+cp -r share/* %{buildroot}%{_usr}/share/mcstrans/
 
 %clean
 rm -rf %{buildroot}
@@ -68,8 +73,23 @@ fi
 %{_mandir}/man8/mcs.8.gz
 /sbin/mcstransd
 %{_sysconfdir}/rc.d/init.d/mcstrans
+%dir %{_sysconfdir}/selinux/mls/setrans.d
+
+%dir %{_usr}/share/mcstrans
+
+%defattr(0644,root,root,0755)
+%dir %{_usr}/share/mcstrans/util
+%dir %{_usr}/share/mcstrans/examples
+%{_usr}/share/mcstrans/examples/*
+
+%defattr(0755,root,root,0755)
+%{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Feb 5 2009 Joe Nall <joe@nall.com> 0.3.1-1
+- Rewrite translations to allow individual word/category mapping
+- Eamon Walsh's color mapping changes
+
 * Wed May 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> 0.2.11-2
 - fix license tag
 
diff --git a/sources b/sources
index 9f7af11..818fba2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c32d4a76f7ba6bb78f8700984591e530  mcstrans-0.2.11.tgz
+b9f80deb6a34211650e19bc283e94e46  mcstrans-0.3.1.tgz