rpms/ocsinventory/devel ocsinventory-schema.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 ocsinventory.spec, 1.12, 1.13 sources, 1.6, 1.7 ocsinventory.patch, 1.1, NONE

Mon Feb 8 16:45:07 UTC 2010

Author: remi

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

Modified Files:
	.cvsignore ocsinventory.spec sources 
Added Files:
	ocsinventory-schema.patch 
Removed Files:
	ocsinventory.patch 
Log Message:
update to new upstream version 1.3

ocsinventory-schema.patch:
 index.php   |    5 +++++
 install.php |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE ocsinventory-schema.patch ---
diff -up ocsreports/index.php.orig ocsreports/index.php
--- ocsreports/index.php.orig	2010-02-08 16:23:03.183263546 +0100
+++ ocsreports/index.php	2010-02-08 16:27:35.310139099 +0100
@@ -39,6 +39,11 @@ require('req.class.php');
 
 @session_start();
 
+// RPM patch check schema version
+if (@file_get_contents('schema') != 'SCHEMA_VERSION') {
+	require('install.php');
+	die();
+}
 // First installation checking
 if( (!$fconf=@fopen("dbconfig.inc.php","r")) || (!function_exists('session_start')) || (!function_exists('mysql_connect'))) {
 	require('install.php');
diff -up ocsreports/install.php.orig ocsreports/install.php
--- ocsreports/install.php.orig	2010-02-08 16:22:57.933145130 +0100
+++ ocsreports/install.php	2010-02-08 16:27:19.883388090 +0100
@@ -245,7 +245,11 @@ if ($keepuser) {
 	fclose($ch);
 	echo "<br><center><font color=green><b>MySql config file successfully written (using new ocs account)</b></font></center>";
 }
-
+// RPM patch - record schema version for upgrade detection
+if ($schema=@fopen('schema','w')) {
+	fwrite($schema,'SCHEMA_VERSION');
+	fclose($schema);
+}
 if($dejaLance>0)	
 	echo "<br><center><font color=green><b>Existing database updated</b></font></center>";
 	


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Feb 2010 06:29:42 -0000	1.6
+++ .cvsignore	8 Feb 2010 16:45:06 -0000	1.7
@@ -1 +1 @@
-OCSNG_UNIX_SERVER-1.02.3.tar.gz
+OCSNG_UNIX_SERVER-1.3.tar.gz


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocsinventory.spec	5 Feb 2010 06:29:42 -0000	1.12
+++ ocsinventory.spec	8 Feb 2010 16:45:06 -0000	1.13
@@ -5,21 +5,26 @@
 %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
+
+# Must check diff between "files/ocsbase.sql"
+%global schema_version  1.3
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
-Version:     1.02.3
+Version:     1.3
 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/+download/OCSNG_UNIX_SERVER-1.3.tar.gz
 Source1:     ocsinventory-reports.conf
 
+Patch0:      ocsinventory-schema.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -128,6 +133,10 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%{__sed} -e 's/SCHEMA_VERSION/%{schema_version}/' %{P:%%PATCH0} \
+    > schema_version.patch
+%{__patch} -p0 --fuzz=0 < schema_version.patch
+
 
 %build
 cd Apache
@@ -155,6 +164,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 +184,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
 
@@ -183,13 +193,23 @@ find %{buildroot}/%{_datadir}/ocsinvento
 
 %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
 
-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
+cat <<EOF | tee %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
+<?php 
+\$_SESSION["SERVEUR_SQL"]="";
+\$_SESSION["COMPTE_BASE"]="ocs";
+\$_SESSION["PSWD_BASE"]="ocs";
+?>
+EOF
+%{__ln_s} ../../../..%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php \
+    %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/
+
+echo "0" >%{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/schema 
+%{__ln_s}   ../../../..%{_sysconfdir}/ocsinventory/ocsinventory-reports/schema \
+    %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/
 
 %{__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 +272,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,10 +281,11 @@ 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
+%attr(644,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/schema
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf
 %{_datadir}/ocsinventory-reports
 %attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports
@@ -273,6 +294,10 @@ fi
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Feb 2010 06:29:43 -0000	1.6
+++ sources	8 Feb 2010 16:45:06 -0000	1.7
@@ -1 +1 @@
-c95f00967f6384e6b078a89b0c89dbd5  OCSNG_UNIX_SERVER-1.02.3.tar.gz
+853e02d5a93f4e7ca2c72155959d81db  OCSNG_UNIX_SERVER-1.3.tar.gz


--- ocsinventory.patch DELETED ---

