rpms/ocsinventory/F-11 ocsinventory-schema.patch, NONE, 1.1 ocsinventory.spec, 1.11, 1.12 sources, 1.6, 1.7 ocsinventory.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704

Modified Files:
	ocsinventory.spec sources 
Added Files:
	ocsinventory-schema.patch 
Removed Files:
	ocsinventory.patch 
Log Message:
update to 1.3.1

ocsinventory-schema.patch:
 header.php  |    2 +-
 install.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ocsinventory-schema.patch ---
diff -up ocsreports/header.php.orig ocsreports/header.php
--- ocsreports/header.php.orig	2010-02-18 18:31:59.251929534 +0100
+++ ocsreports/header.php	2010-02-18 18:32:01.656055544 +0100
@@ -30,7 +30,7 @@ if( !$valUpd || $valUpd["tvalue"]<GUI_VE
 	die();
 }
 
-if (!isset($_SESSION["SERVEUR_SQL"])){
+if (!isset($_SESSION["SERVEUR_SQL"]) || empty($_SESSION["SERVEUR_SQL"])){
 	$fromdbconfig_out = true;
 	require('install.php');
 	die();	
diff -up ocsreports/install.php.orig ocsreports/install.php
--- ocsreports/install.php.orig	2010-02-18 18:35:04.959055185 +0100
+++ ocsreports/install.php	2010-02-18 18:33:55.393930626 +0100
@@ -26,7 +26,7 @@ if( isset($fromAuto) && $fromAuto==true)
 echo "<center><br><font color='green'><b>Current installed version ".$valUpd["tvalue"]." is lower than this version (".GUI_VER.") automatic install launched</b></red><br></center>";
 
 if( isset($fromdbconfig_out) && $fromdbconfig_out==true)
-echo "<center><br><font color='green'><b>dbconfig.conf.php is corrupted. Automatic install launched</b></red><br></center>";
+echo "<center><br><font color='green'><b>DB configuration not completed. Automatic install launched</b></red><br></center>";
 
 /*
 if(!isset($_POST["name"])) {


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/F-11/ocsinventory.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocsinventory.spec	5 Feb 2010 06:40:06 -0000	1.11
+++ ocsinventory.spec	18 Feb 2010 18:16:55 -0000	1.12
@@ -5,21 +5,24 @@
 %endif
 
 # Remember to change this and Source0 for each release. thanks to launchpad :(
-%global tarname OCSNG_UNIX_SERVER-1.02.3
+%global tarname OCSNG_UNIX_SERVER-1.3.1
+
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
-Version:     1.02.3
+Version:     1.3.1
 Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
 URL:         http://www.ocsinventory-ng.org/
 
-Source0:     http://launchpad.net/ocsinventory-server/stable-1.02/stable-release-1.02.3/+download/%{tarname}.tar.gz
+# This change for each version... thanks launchpad :(
+Source0:     http://launchpad.net/ocsinventory-server/stable-1.3/server-release-1.3.1/+download/OCSNG_UNIX_SERVER-1.3.1.tar.gz
 Source1:     ocsinventory-reports.conf
 
+Patch0:      ocsinventory-schema.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -128,6 +131,8 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p0
+
 
 %build
 cd Apache
@@ -155,6 +160,8 @@ rm -f %{buildroot}%{perl_vendorlib}/Apac
 rm -f %{buildroot}%{perl_vendorlib}/Apache/Ocsinventory/Server/Modperl1.pm
 %endif
 
+cd ..
+
 %{__mkdir_p} %{buildroot}%{_localstatedir}/log/ocsinventory-server
 
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
@@ -173,7 +180,6 @@ rm -f %{buildroot}%{perl_vendorlib}/Apac
     -e "s;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;g" \
     ./etc/ocsinventory/ocsinventory-server.conf | \
     grep -v IfModule >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
-cd ..
 
 # --- ocsinventory-reports --- administration console
 
@@ -187,9 +193,10 @@ mv %{buildroot}/%{_datadir}/ocsinventory
    %{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
 
+
 %{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-reports/{download,ipd}
 
-%{__install} -pm 755 Apache/binutils/ipdiscover-util.pl %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/ipdiscover-util.pl
+%{__install} -pm 755 binutils/ipdiscover-util.pl %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/ipdiscover-util.pl
 
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
 %{__sed} -e "s;OCSREPORTS_ALIAS;/ocsreports;g" \
@@ -252,7 +259,7 @@ fi
 
 %files server
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README Apache/Changes
 %config(noreplace) %{_sysconfdir}/logrotate.d/ocsinventory-server
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
 %attr(755,apache,root) %{_localstatedir}/log/ocsinventory-server
@@ -261,7 +268,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README ChangeLog
+%doc LICENSE.txt README
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -273,6 +280,14 @@ fi
 
 
 %changelog
+* Thu Feb 18 2010 Remi Collet <Fedora at famillecollet.com> 1.3.1-1
+- update to new version
+- improved patch for schema
+
+* Sun Feb 07 2010 Remi Collet <Fedora at famillecollet.com> 1.3-1
+- update to new version
+- add a patch to improve schema check (when install / upgrade needed)
+
 * Fri Feb 05 2010 Remi Collet <Fedora at famillecollet.com> 1.02.3-1
 - Security Fixes - Bug #560737
 
@@ -280,6 +295,9 @@ fi
 - add ChangeLog
 - Security Fixes (internal version 5003) Bug #517837
 
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-1
 - update to OCS Inventory NG 1.02.1 - Security Fixes (internal version 5003)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Feb 2010 06:40:07 -0000	1.6
+++ sources	18 Feb 2010 18:16:55 -0000	1.7
@@ -1 +1 @@
-c95f00967f6384e6b078a89b0c89dbd5  OCSNG_UNIX_SERVER-1.02.3.tar.gz
+cef3d4204a4b2a02d89a9801e373c11e  OCSNG_UNIX_SERVER-1.3.1.tar.gz


--- ocsinventory.patch DELETED ---