rpms/ocsinventory/devel ocsinventory-upstream.patch, NONE, 1.1 ocsinventory.spec, 1.16, 1.17
Remi Collet
remi at fedoraproject.org
Sat Jun 19 05:46:59 UTC 2010
- Previous message: rpms/bdii/EL-4 .cvsignore, 1.2, 1.3 bdii-init.patch, 1.1, 1.2 bdii.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/ocsinventory/F-13 ocsinventory-upstream.patch, NONE, 1.1 ocsinventory.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/pkgs/rpms/ocsinventory/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29624
Modified Files:
ocsinventory.spec
Added Files:
ocsinventory-upstream.patch
Log Message:
add upstream patches for install / update process
ocsinventory-upstream.patch:
dbconfig.inc.php | 2 +-
js/datetimepicker.js | 2 +-
preferences.php | 35 ++++++++++++++++++++++++-----------
3 files changed, 26 insertions(+), 13 deletions(-)
--- NEW FILE ocsinventory-upstream.patch ---
force install.php for first install, tx to Remi
http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/57
When opening the Date Time Picker in the administrative data for an inventoried computer,
the year comes up as 2005. I tracked down the problem to the file
/usr/share/ocsinventory-reports/ocsreports/js/datetimepicker.js on line 108 the date is
being reset to 2005. I fixed this problem in my own installation by adding a line 109
that reads "Cal.Year = dtToday.getFullYear();", however it would be nice if it were
fixed in subsequent versions. Thanks, tx to Natrinicle
https://bugs.launchpad.net/bugs/585077
http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/58
Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
=== modified file 'dbconfig.inc.php'
--- dbconfig.inc.php 2009-11-03 19:45:02 +0000
+++ dbconfig.inc.php 2010-05-19 18:36:54 +0000
@@ -1,5 +1,5 @@
<?php
-$_SESSION["SERVEUR_SQL"]="";
+//$_SESSION["SERVEUR_SQL"]="";
$_SESSION["COMPTE_BASE"]="ocs";
$_SESSION["PSWD_BASE"]="ocs";
?>
\ No newline at end of file
=== modified file 'js/datetimepicker.js'
--- js/datetimepicker.js 2009-06-29 11:51:53 +0000
+++ js/datetimepicker.js 2010-05-26 06:36:17 +0000
@@ -105,7 +105,7 @@
if (YearPattern.test(strYear))
Cal.Year=parseInt(strYear,10);
- if( Cal.Year == 0 ) Cal.Year = 2005;
+ if( Cal.Year == 0 ) Cal.Year = dtToday.getFullYear();
//end parse year
//parse time
if (Cal.ShowTime==true)
=== modified file 'preferences.php'
--- preferences.php 2010-05-03 15:15:39 +0000
+++ preferences.php 2010-06-17 10:03:38 +0000
@@ -57,6 +57,19 @@
$_SESSION["queryString"] .= "&".$key."=".$val;
}
+
+//Delete all cookies if GUI_VER change
+if ($_COOKIE["VERS"] != GUI_VER){
+ if( isset( $_COOKIE["col"] ) ) {
+ foreach( $_COOKIE["col"] as $key=>$val ) {
+ setcookie( "col[$key][value]", FALSE, time() - 3600 ); // deleting corresponding cookie
+ setcookie( "col[$key][rang]", FALSE, time() - 3600 ); // deleting corresponding cookie
+ }
+ unset( $_COOKIE["col"] );
+ setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
+ }
+}
+
if( isset($_GET["uid"]) ) {
setcookie( "DefNetwork", $_GET["uid"], time() + 3600 * 24 * 15 );
}
@@ -369,7 +382,7 @@
$_POST[$var]=0+$_POST[$var];// si un nombre est attendu, on transforme en nombre
$req->where=str_replace("option$ind",$_POST[$var],$req->where);
- // on remplace les strings "optionX" de la requete par leurs valeurs présentes dans les variables en POST
+ // on remplace les strings "optionX" de la requete par leurs valeurs pr�sentes dans les variables en POST
$ind++;
$var="option".$ind;
}
@@ -575,7 +588,7 @@
if( $req->countId == "h.id" ) //computer in devices
echo "<td width='15px'> </td>";*/
- while($colname=mysql_fetch_field($result)) // On récupère le nom de toutes les colonnes
+ while($colname=mysql_fetch_field($result)) // On r�cup�re le nom de toutes les colonnes
{
if($colname->name!="h.id"&&$colname->name!="deviceid")
{
@@ -691,7 +704,7 @@
$listIdGroup .= $valIdGroup['ID'].",";
}
$listIdGroup=substr($listIdGroup,0,-1);
- while($item = mysql_fetch_array($result)) // Parcour de toutes les lignes résultat
+ while($item = mysql_fetch_array($result)) // Parcour de toutes les lignes r�sultat
{
flush();
echo "<TR height=20px ". ($x == 1 ? "bgcolor='#FFFFFF'" : "bgcolor='#F2F2F2'") .">"; // on alterne les couleurs de ligne
@@ -734,7 +747,7 @@
echo "<td> </td>";
}*/
- foreach($tabChamps as $chmp) {// Affichage de toutes les valeurs résultats
+ foreach($tabChamps as $chmp) {// Affichage de toutes les valeurs r�sultats
echo "<td align='center'>";
$isLink = FALSE;
if($chmp==TAG_LBL)
@@ -795,14 +808,14 @@
//affichage des statistiques pour l'activation de paquet
if( $teledeploy ) {
$statResult="";
- //recherche tous les ID dans download_enable qui correspondent à ce timestamp
+ //recherche tous les ID dans download_enable qui correspondent � ce timestamp
$sqlStat="SELECT ID
FROM download_enable
WHERE fileid='".$item["Timestamp"]."'";
$resStat = mysql_query( $sqlStat, $_SESSION["readServer"] );
$listIdstat="";
while( $valStat = mysql_fetch_array( $resStat ) ) {
- //création de la list pour effectuer un "in"
+ //cr�ation de la list pour effectuer un "in"
$listIdstat .= $valStat["ID"].",";
}
$listIdstat=substr($listIdstat,0,-1);
@@ -1402,7 +1415,7 @@
echo "<p align='center'>";
if( $numPages > 1 ) {
if( $_SESSION["pageCur"] == 1) {
- echo " ";//voir grisé
+ echo " ";//voir gris�
echo " 1 ..";
} else {
echo " {$prefG}-1><img src='image/prec24.png'></a>";
@@ -1415,7 +1428,7 @@
if( $_SESSION["pageCur"] >= $numPages) {
echo ".. $numPages ";
- //echo "<img src='image/proch24.png'> "; voir grisé
+ //echo "<img src='image/proch24.png'> "; voir gris�
} else {
echo ".. {$prefG}$numPages>$numPages</a> ";
echo "{$prefG}-2><img src='image/proch24.png'></a> ";
=== modified file 'preferences.php'
--- preferences.php 2010-06-17 10:03:38 +0000
+++ preferences.php 2010-06-17 10:08:54 +0000
@@ -59,15 +59,15 @@
//Delete all cookies if GUI_VER change
-if ($_COOKIE["VERS"] != GUI_VER){
+if (!isset($_COOKIE["VERS"]) or $_COOKIE["VERS"] != GUI_VER){
if( isset( $_COOKIE["col"] ) ) {
foreach( $_COOKIE["col"] as $key=>$val ) {
setcookie( "col[$key][value]", FALSE, time() - 3600 ); // deleting corresponding cookie
setcookie( "col[$key][rang]", FALSE, time() - 3600 ); // deleting corresponding cookie
}
- unset( $_COOKIE["col"] );
- setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
+ unset( $_COOKIE["col"] );
}
+ setcookie( "VERS", GUI_VER, time() + 3600 * 24 * 365 ); //expires in 365 days
}
if( isset($_GET["uid"]) ) {
Index: ocsinventory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocsinventory.spec 1 Jun 2010 20:21:34 -0000 1.16
+++ ocsinventory.spec 19 Jun 2010 05:46:59 -0000 1.17
@@ -12,7 +12,7 @@ Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
Version: 1.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Internet
License: GPLv2
@@ -23,6 +23,9 @@ Source0: http://launchpad.net/ocsinv
Source1: ocsinventory-reports.conf
Patch0: %{name}-shorttag.patch
+# Upstream patch from Bzr
+Patch1: %{name}-upstream.patch
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -131,6 +134,8 @@ navigateur favori.
%setup -q -n %{tarname}-%{version}
%patch0 -p1
+cd ocsreports
+%patch1 -p0
%build
@@ -279,6 +284,9 @@ fi
%changelog
+* Sat Jun 19 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.2-3
+- upstream patches
+
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.3.2-2
- Mass rebuild with perl-5.12.0
- Previous message: rpms/bdii/EL-4 .cvsignore, 1.2, 1.3 bdii-init.patch, 1.1, 1.2 bdii.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/ocsinventory/F-13 ocsinventory-upstream.patch, NONE, 1.1 ocsinventory.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list