rpms/libsemanage/devel libsemanage-rhat.patch, 1.24, 1.25 libsemanage.spec, 1.131, 1.132

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32429

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
+++ libsemanage-rhat.patch	6 Sep 2007 02:48:04 -0000	1.25
@@ -74,21 +74,6 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
---- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
-@@ -37,10 +37,10 @@
- 	int expand_check;
- 	int save_previous;
- 	int save_linked;
--	int disable_genhomedircon;
- 	mode_t file_mode;
- 	struct external_prog *load_policy;
- 	struct external_prog *setfiles;
-+	struct external_prog *genhomedircon;
- 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
- } semanage_conf_t;
- 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libsemanage.spec	5 Sep 2007 18:51:36 -0000	1.131
+++ libsemanage.spec	6 Sep 2007 02:48:04 -0000	1.132
@@ -10,7 +10,7 @@
 Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libselinux-devel >= %{libselinuxver} swig
+BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel
 BuildRequires: libsepol-devel >= %{libsepolver} 
 BuildRequires: python-devel bison flex
 
@@ -33,7 +33,7 @@
 %package devel
 Summary: Header files and libraries used to build policy manipulation tools
 Group: Development/Libraries
-Requires: libsemanage = %{version}-%{release}
+Requires: libsemanage = %{version}-%{release} ustr
 
 %description devel
 The semanage-devel package contains the static libraries and header files