rpms/sepostgresql/F-9 sepostgresql.init, 1.30, 1.31 sepostgresql.spec, 1.32, 1.33

[KaiGai Kohei]

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16778

Modified Files:
	sepostgresql.init sepostgresql.spec 
Log Message:
security policy fix in Fedora9



Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sepostgresql.init	6 Feb 2009 04:01:19 -0000	1.30
+++ sepostgresql.init	7 Feb 2009 04:17:50 -0000	1.31
@@ -9,7 +9,7 @@
 
 PGVERSION="8.3.6"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.1520"
+SEPGVERSION="2.1523"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sepostgresql.spec	6 Feb 2009 04:01:19 -0000	1.32
+++ sepostgresql.spec	7 Feb 2009 04:17:50 -0000	1.33
@@ -22,7 +22,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.6
-Release: 2.1520%{?sepgsql_extension}%{?dist}
+Release: 2.1523%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -88,21 +88,24 @@
 
 # parallel build, if possible
 make %{?_smp_mflags}
-# to create empty .fc file
+%if !%{fedora9}
 touch src/backend/security/sepgsql/policy/sepostgresql-devel.fc
 make -C src/backend/security/sepgsql/policy
+%endif
 
 %install
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
 
+%if !%{fedora9}
 for store in %{selinux_policy_stores}
 do
     install -d %{buildroot}%{_datadir}/selinux/${store}
     install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp.${store} \
                %{buildroot}%{_datadir}/selinux/${store}/sepostgresql-devel.pp
 done
+%endif
 
 # avoid to conflict with native postgresql package
 mv %{buildroot}%{_bindir}  %{buildroot}%{_bindir}.orig
@@ -152,6 +155,7 @@
 /sbin/chkconfig --add %{name}
 /sbin/ldconfig
 
+%if !%{fedora9}
 for store in %{selinux_policy_stores}
 do
     %{_sbindir}/semodule -s ${store} -r sepostgresql >& /dev/null || :
@@ -160,6 +164,7 @@
             -i %{_datadir}/selinux/${store}/sepostgresql-devel.pp >& /dev/null || :
     fi
 done
+%endif
 
 # Fix up non-standard file contexts
 /sbin/fixfiles -R %{name} restore || :
@@ -208,7 +213,9 @@
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
 %{_datadir}/sepgsql/sql_features.txt
+%if !%{fedora9}
 %attr(644,root,root) %{_datadir}/selinux/*/sepostgresql-devel.pp
+%endif
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups