From 8eaffc9c117e68a32f8dff9814e9ece70d3efea3 Mon Sep 17 00:00:00 2001
From: Yuichi Nakamura <ynakam@fedoraproject.org>
Date: Fri, 9 Feb 2007 04:35:01 +0000
Subject: [PATCH] Updated for 2.1.0

---
 seedit.spec | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/seedit.spec b/seedit.spec
index d6a4e38..3fb00fc 100644
--- a/seedit.spec
+++ b/seedit.spec
@@ -1,5 +1,4 @@
-%define betatag beta6.7
-%define buildnum 15
+%define buildnum 1
 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 
 %define selinuxconf %{_sysconfdir}/selinux/config
@@ -9,23 +8,26 @@
 #Whether SELinux supports modular policy, after FC5 "y"
 %define modular y
 #Whether pam supports include syntax, after FC5 "y"
-%define pam_include_support y
+%define pam_include_support y  
+#Whether audit support obj_type field, after FC6 "y"
+%define audit_obj_type_support  y
 #Version of sample policy file
 %define sample_policy_type fc6
 
 Name: seedit         
 Version: 2.1.0
-Release: 0.%{buildnum}.%{betatag}%{?dist}
+Release: %{buildnum}%{?dist}
 Summary: SELinux Policy Editor:Core component
 Group:  System Environment/Base        
 License: GPL       
 URL: http://seedit.sourceforge.net/
-Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}-%{betatag}.tar.gz
+Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz
 Source1: seedit-gui.desktop
 Source2: seedit-gui.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n)
 BuildRequires:  libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex
 Requires:  checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1
+Provides: seedit-converter
 
 %description
 SELinux Policy Editor(SEEdit) is a tool to make SELinux easy.
@@ -49,18 +51,22 @@ popd
 rm -rf %{buildroot}
 
 pushd core
-make install  DESTDIR=%{buildroot}  PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types}  MODULAR=%{modular}
+make install  DESTDIR=%{buildroot}  PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types}  MODULAR=%{modular}  AUDIT_OBJ_TYPE_SUPPORT=%{audit_obj_type_support}
 popd
 
 pushd policy
-make install DESTDIR=%{buildroot}  DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules}
+make install DESTDIR=%{buildroot}  DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} 
 popd
 
 pushd gui
 make install DESTDIR=%{buildroot}  PYTHON_SITELIB=%{buildroot}/%{python_sitelib} PAM_INCLUDE_SUPPORT=%{pam_include_support}
 
+#For Asianux2
+#AX2 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+#AX2 install -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor "" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
+
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seedit-gui.png
 popd
@@ -85,14 +91,14 @@ rm -rf %{buildroot}
 %{_bindir}/seedit-unconfined
 %{_bindir}/seedit-template
 %dir %{python_sitelib}/%{name}
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyo
-%{python_sitelib}/%{name}/*.pyc
+%{python_sitelib}/%{name}/*.*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Makefile
 %{_datadir}/%{name}/macros
 %{_datadir}/%{name}/base_policy
 %dir %{_datadir}/%{name}/sepolicy
+%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/%{name}/seedit-load.conf
 
 %package policy
 Summary: SELinux Policy Editor: Sample simplified policy
@@ -121,7 +127,7 @@ fi
 
 %files policy
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/policy
 %config(noreplace) %{_sysconfdir}/selinux/%{name}
 %{_datadir}/%{name}/initialize/
 %{_sbindir}/seedit-init
@@ -134,7 +140,8 @@ Group: System Environment/Base
 Requires: usermode
 Requires: pygtk2
 Requires: pam >= 0.80-9
-BuildRequires: desktop-file-utils, gettext
+BuildRequires: desktop-file-utils
+BuildRequires:  gettext
 Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release}
 
 %description gui
@@ -159,6 +166,13 @@ X based GUI for SELinux Policy Editor
 
 
 %changelog
+* Tue Feb 6 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-1
+ - Fixed bug in RBAC
+ - Fixed installer for Asianux
+
+* Wed Jan 31 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-0.16.beta7
+ - Fixed for CentOS4, package build failed.
+
 * Sat Jan 27 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-0.15.beta6.7
  - Fixed Requires
  - Fixed makefiles to preserve timestamps.