rpms/ocsinventory/devel .cvsignore, 1.7, 1.8 ocsinventory-schema.patch, 1.1, 1.2 ocsinventory.spec, 1.13, 1.14 sources, 1.7, 1.8
Remi Collet
remi at fedoraproject.org
Thu Feb 18 17:51:55 UTC 2010
Author: remi
Update of /cvs/pkgs/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8249
Modified Files:
.cvsignore ocsinventory-schema.patch ocsinventory.spec sources
Log Message:
update to 1.3.1 (minor bugfix)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 8 Feb 2010 16:45:06 -0000 1.7
+++ .cvsignore 18 Feb 2010 17:51:55 -0000 1.8
@@ -1 +1 @@
-OCSNG_UNIX_SERVER-1.3.tar.gz
+OCSNG_UNIX_SERVER-1.3.1.tar.gz
ocsinventory-schema.patch:
header.php | 2 +-
install.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: ocsinventory-schema.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/ocsinventory-schema.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocsinventory-schema.patch 8 Feb 2010 16:45:06 -0000 1.1
+++ ocsinventory-schema.patch 18 Feb 2010 17:51:55 -0000 1.2
@@ -1,31 +1,24 @@
-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();
+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();
+ }
-+// 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'))) {
+-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-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>";
-
+--- 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/devel/ocsinventory.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocsinventory.spec 8 Feb 2010 16:45:06 -0000 1.13
+++ ocsinventory.spec 18 Feb 2010 17:51:55 -0000 1.14
@@ -5,15 +5,13 @@
%endif
# Remember to change this and Source0 for each release. thanks to launchpad :(
-%global tarname OCSNG_UNIX_SERVER-1.3
+%global tarname OCSNG_UNIX_SERVER-1.3.1
-# Must check diff between "files/ocsbase.sql"
-%global schema_version 1.3
Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
-Version: 1.3
+Version: 1.3.1
Release: 1%{?dist}
Group: Applications/Internet
@@ -21,7 +19,7 @@ License: GPLv2
URL: http://www.ocsinventory-ng.org/
# 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
+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
@@ -133,9 +131,7 @@ 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
+%patch0 -p0
%build
@@ -193,19 +189,10 @@ find %{buildroot}/%{_datadir}/ocsinvento
%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
-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/
+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
+
%{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-reports/{download,ipd}
@@ -285,7 +272,6 @@ fi
%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
@@ -294,6 +280,10 @@ 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)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 8 Feb 2010 16:45:06 -0000 1.7
+++ sources 18 Feb 2010 17:51:55 -0000 1.8
@@ -1 +1 @@
-853e02d5a93f4e7ca2c72155959d81db OCSNG_UNIX_SERVER-1.3.tar.gz
+cef3d4204a4b2a02d89a9801e373c11e OCSNG_UNIX_SERVER-1.3.1.tar.gz
More information about the scm-commits
mailing list