rpms/libsemanage/devel libsemanage-rhat.patch, 1.1, 1.2 libsemanage.spec, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11738

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Jul 7 2005 Dan Walsh <dwalsh at redhat.com> 1.0-1
- Update from NSA
	* Merged errno fix from Joshua Brindle (Tresys).
	* Merged fix for semod_build_modules_list leak on error path
	  from Serge Hallyn (IBM).  Bug found by Coverity.
	* Merged several fixes from Serge Hallyn (IBM).  Bugs found by
	  Coverity.
	* Fixed several other bugs and warnings.
	* Merged patch to move module read/write code from libsemanage
	  to libsepol from Jason Tang (Tresys).	
	* Merged relay records patch from Ivan Gyurdiev.
	* Merged key extract patch from Ivan Gyurdiev.


libsemanage-rhat.patch:
 Makefile   |    3 +--
 semod.conf |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsemanage-rhat.patch	30 Aug 2005 13:46:52 -0000	1.1
+++ libsemanage-rhat.patch	30 Aug 2005 14:22:49 -0000	1.2
@@ -1,5 +1,5 @@
---- libsemanage-1.1.4/src/semod.conf~	2005-08-30 09:24:00.000000000 -0400
-+++ libsemanage-1.1.4/src/semod.conf	2005-08-30 09:47:12.000000000 -0400
+--- libsemanage-1.1.4/src/semod.conf.rhat	2005-08-30 09:24:00.000000000 -0400
++++ libsemanage-1.1.4/src/semod.conf	2005-08-30 10:22:33.000000000 -0400
 @@ -16,10 +16,10 @@
  #  License along with this library; if not, write to the Free Software
  #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -22,8 +22,8 @@
  # by calling the setfiles utility.  As above, "$@" will be replaced
  # with the policy filename.  In addition "$<" will be replaced with
  # the file contexts filename.
---- libsemanage-1.1.4/src/Makefile~	2005-08-30 09:24:00.000000000 -0400
-+++ libsemanage-1.1.4/src/Makefile	2005-08-30 09:39:56.000000000 -0400
+--- libsemanage-1.1.4/src/Makefile.rhat	2005-08-30 09:24:00.000000000 -0400
++++ libsemanage-1.1.4/src/Makefile	2005-08-30 10:23:09.000000000 -0400
 @@ -4,7 +4,7 @@
  SHLIBDIR ?= $(DESTDIR)/lib
  INCLUDEDIR ?= $(PREFIX)/include
@@ -33,12 +33,11 @@
  
  LEX = flex
  LFLAGS = -s
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,6 @@
  install: all
  	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
  	install -m 644 $(LIBA) $(LIBDIR)
 -	install -m 644 -D semod.conf $(DEFAULT_SEMOD_CONF_LOCATION)
-+	install -m 644 -D semod.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
  
  clean: 
  	rm -f $(OBJS) $(LIBA) conf-scan.c conf-parse.c conf-parse.h


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsemanage.spec	30 Aug 2005 13:46:52 -0000	1.2
+++ libsemanage.spec	30 Aug 2005 14:22:49 -0000	1.3
@@ -1,14 +1,12 @@
 Summary: SELinux binary policy manipulation library 
-Name: libsemanage
+Name: libsemanage-devel
 Version: 1.1.4
 Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
 Patch: libsemanage-rhat.patch
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
-Provides: libsemanage.so
 
 %description
 Security-enhanced Linux is a patch of the Linux® kernel and a number
@@ -26,17 +24,12 @@
 as by programs like load_policy that need to perform specific transformations
 on binary policies such as customizing policy boolean settings.
 
-%package devel
-Summary: Header files and libraries used to build policy manipulation tools
-Group: Development/Libraries
-Requires: libsemanage = %{version}
-
-%description devel
+%description
 The semanage-devel package contains the static libraries and header files
 needed for developing applications that manipulate binary policies. 
 
 %prep
-%setup -q
+%setup -q -n libsemanage-%{version}
 %patch  -p1 -b .rhat
 
 %build
@@ -51,19 +44,11 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files devel
+%files
 %defattr(-,root,root)
 %{_libdir}/libsemanage.a
 %{_includedir}/semanage/*.h
 
-%files
-%defattr(-,root,root)
-%config(noreplace) /etc/selinux/semod.conf
-
 %changelog
 * Thu Jul 7 2005 Dan Walsh <dwalsh at redhat.com> 1.0-1
 - Update from NSA