rpms/ocsinventory/devel .cvsignore, 1.2, 1.3 ocsinventory.spec, 1.2, 1.3 sources, 1.2, 1.3 ocsinventory-path.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31294

Modified Files:
	.cvsignore ocsinventory.spec sources 
Removed Files:
	ocsinventory-path.patch 
Log Message:
update from RC2 to RC3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jun 2008 05:07:04 -0000	1.2
+++ .cvsignore	11 Oct 2008 08:46:00 -0000	1.3
@@ -1 +1 @@
-OCSNG_UNIX_SERVER_1.02_RC2.tar.gz
+OCSNG_UNIX_SERVER_1.02RC3.tar.gz


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocsinventory.spec	25 Jul 2008 16:53:07 -0000	1.2
+++ ocsinventory.spec	11 Oct 2008 08:46:01 -0000	1.3
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02_RC2
+%define tarname OCSNG_UNIX_SERVER_1.02RC3
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.6.rc2%{?dist}
+Release:     0.7.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,11 +19,6 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/ocsreports/files/ocsbase.sql?r1=1.25&r2=1.26&view=patch&sortby=date
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/README?r1=1.6&r2=1.7&view=patch&sortby=date
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/setup.sh?r1=1.18&r2=1.20&view=patch&sortby=date
-Patch0:      ocsinventory-path.patch
-
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -125,15 +120,12 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p0
+# Force GUI to use RPM default dir (RC3 regression reported upstream)
+cat <<EOSQL >>ocsreports/files/ocsbase.sql
 
-cat <<EOF >dbconfig.inc.php
-<?php
-\$_SESSION["SERVEUR_SQL"]="";
-\$_SESSION["COMPTE_BASE"]="ocs";
-\$_SESSION["PSWD_BASE"]="ocs";
-?>
-EOF
+insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_PACK_DIR','','%{_localstatedir}/lib/ocsinventory-reports','RPM Directory for download files');
+insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_IPD_DIR','','%{_localstatedir}/lib/ocsinventory-reports','RPM Directory for Ipdiscover files');
+EOSQL
 
 
 %build
@@ -189,7 +181,8 @@
 find %{buildroot}/%{_datadir}/ocsinventory-reports \( -name \*.php -o -name \*.css \) -exec chmod -x {} \;
 
 %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
-%{__install} -m640 dbconfig.inc.php \
+
+mv %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php \
    %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
 ln -s ../../../../%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php
 
@@ -279,6 +272,9 @@
 
 
 %changelog
+* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.7.rc3
+- update to RC3
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jun 2008 05:07:04 -0000	1.2
+++ sources	11 Oct 2008 08:46:01 -0000	1.3
@@ -1 +1 @@
-4c582d29db7777506b5cfe49f15af3c4  OCSNG_UNIX_SERVER_1.02_RC2.tar.gz
+f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz


--- ocsinventory-path.patch DELETED ---