dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 03:04:16 +00:00 · 2009-11-26 01:33:08 +00:00 · 2009-10-16 13:53:08 +00:00 · 2009-09-29 05:28:53 +00:00
4 changed files with 37 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: mcstrans
-# $Id: Makefile,v 1.1 2006/05/03 16:13:52 dwalsh Exp $
-NAME := mcstrans
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/mcstrans-0.3.1-man.patch
+++ b/mcstrans-0.3.1-man.patch
@ -0,0 +1,29 @@
+diff -up mcstrans-0.3.1/man/man8/mcstransd.8.man mcstrans-0.3.1/man/man8/mcstransd.8
+--- mcstrans-0.3.1/man/man8/mcstransd.8.man	2009-10-16 09:50:45.000000000 -0400
+++ mcstrans-0.3.1/man/man8/mcstransd.8	2009-10-16 09:48:28.000000000 -0400
+@@ -0,0 +1,25 @@
+.TH "mcstransd" "8" "16 Oct 2009" "dwalsh@redhat.com" "mcs documentation"
+.SH "NAME"
+mcstransd \- MCS (Multiple Category System) daemon.  Translates SELinux MCS/MLS labels to human readable form.
+
+.SH "SYNOPSIS"
+.B mcstransd 
+.P
+
+.SH "DESCRIPTION"
+This manual page describes the
+.BR mcstransd
+program.
+.P
+This daemon reads /etc/selinux/{SELINUXTYPE}/setrans.conf configuration file, and communicates with libselinux via a socket in /var/run/setrans.
+
+.SH "AUTHOR"
+This man page was written by Dan Walsh <dwalsh@redhat.com>.
+The program was originally written by Dan Walsh <dwalsh@redhat.com>.
+The program was enhanced/rwwritten by Joe Nall <joe@nall.com>.
+
+.SH "FILES"
+/etc/selinux/{SELINUXTYPE}/setrans.conf 
+
+.SH "SEE ALSO"
+.BR mcs (8),
--- a/mcstrans.spec
+++ b/mcstrans.spec
@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@ -14,6 +14,7 @@ Requires(post):/sbin/chkconfig /sbin/service
 Provides: setransd
 Provides: libsetrans
 Patch: mcstrans-0.3.1-init.patch
+Patch1: mcstrans-0.3.1-man.patch
 Obsoletes: libsetrans

 %description
@ -32,7 +33,8 @@ from internal representations to user defined representation.

 %prep
 %setup -q
-%patch -p1 
+%patch -p1 -b .init
+%patch1 -p1 -b .man

 %build
 make clean
@ -73,6 +75,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_mandir}/man8/mcs.8.gz
+%{_mandir}/man8/mcstransd.8.gz
 /sbin/mcstransd
 %{_sysconfdir}/rc.d/init.d/mcstrans
 %dir %{_sysconfdir}/selinux/mls/setrans.d
@ -88,6 +91,9 @@ fi
 %{_usr}/share/mcstrans/util/*

 %changelog
+* Thu Oct 16 2009 Dan Walsh <dwalsh@redhat.com> 0.3.1-4
+- Add mcstransd man page
+
 * Thu Sep 17 2009 Miroslav Grepl <mgrepl@redhat.com> 0.3.1-3
 - Fix init script
Author	SHA1	Message	Date
Fedora Release Engineering	ea146311d0	dist-git conversion	2010-07-29 03:04:16 +00:00
Bill Nottingham	59c818e088	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:33:08 +00:00
Daniel J Walsh	5145be61a0	- Add mcstransd man page	2009-10-16 13:53:08 +00:00
Jesse Keating	30ebfedffb	Initialize branch F-12 for mcstrans	2009-09-29 05:28:53 +00:00