rpms/ocsinventory/devel ocsinventory-reports.conf, 1.1, 1.2 ocsinventory.spec, 1.1, 1.2

[Remi Collet (remi)]

Author: remi

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

Modified Files:
	ocsinventory-reports.conf ocsinventory.spec 
Log Message:
minor spec/config fixes


Index: ocsinventory-reports.conf
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory-reports.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-reports.conf	24 Jun 2008 05:07:04 -0000	1.1
+++ ocsinventory-reports.conf	25 Jul 2008 16:53:07 -0000	1.2
@@ -23,7 +23,6 @@
 #        ServerName   ocsinventory-ng
 #        ServerAlias  ocsinventory-ng.yourdomain.tld
 #        DocumentRoot PATH_TO_OCSREPORTS_DIR
-#        AddDefaultCharset ISO-8859-1
 
 Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORTS_DIR
 
@@ -31,6 +30,8 @@
     # By default, users can use console from everywhere
     Order deny,allow
     Allow from all
+
+    AddDefaultCharset ISO-8859-1
     
     Options Indexes FollowSymLinks
     DirectoryIndex index.php


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory.spec	24 Jun 2008 05:07:04 -0000	1.1
+++ ocsinventory.spec	25 Jul 2008 16:53:07 -0000	1.2
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.5.rc2%{?dist}
+Release:     0.6.rc2%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -71,6 +71,10 @@
 Group:    Applications/Internet
 Summary:  OCS Inventory NG - Communication server
 Requires: mod_perl
+%if 0%{?rhel} != 4
+# when use with mod_perl2
+Requires: perl(SOAP::Transport::HTTP2)
+%endif
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Required by the original setup script, but not detected automatically :
 # Apache::DBI drags in DBI
@@ -221,10 +225,10 @@
 (
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?"
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-server(/.*)?"
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-reports(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
-restorecon -R %{_localstatedir}/lib/ocsinventory-server
+restorecon -R %{_localstatedir}/lib/ocsinventory-reports
 ) ||:
 %endif
 
@@ -275,6 +279,11 @@
 
 
 %changelog
+* Tue Jul 22 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.6.rc2
+- add missing requires perl(SOAP::Transport::HTTP2) (with mod_perl2)
+- AddDefaultCharset ISO-8859-1 in httpd config
+- fix SElinux path
+
 * Sat Jun 14 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.5.rc2
 - change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports
 - add Requires nmap and samba-client (nmblookup)