rpms/ocsinventory/EL-6 ocsinventory-shorttag.patch, NONE, 1.1 ocsinventory-upstream.patch, NONE, 1.1 ocsinventory-reports.conf, 1.2, 1.3 ocsinventory.spec, 1.13, 1.14 sources, 1.7, 1.8 ocsinventory-schema.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Sat Jun 19 06:17:18 UTC 2010
- Previous message: rpms/ocsinventory/EL-4 ocsinventory-shorttag.patch, NONE, 1.1 ocsinventory-upstream.patch, NONE, 1.1 ocsinventory-reports.conf, 1.2, 1.3 ocsinventory.spec, 1.8, 1.9 sources, 1.7, 1.8 ocsinventory-schema.patch, 1.1, NONE
- Next message: File Net-SSLGlue-0.4.tar.gz uploaded to lookaside cache by remi
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/pkgs/rpms/ocsinventory/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32047
Modified Files:
ocsinventory-reports.conf ocsinventory.spec sources
Added Files:
ocsinventory-shorttag.patch ocsinventory-upstream.patch
Removed Files:
ocsinventory-schema.patch
Log Message:
update to 1.3.2 with some upstream patches
ocsinventory-shorttag.patch:
blacklist.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ocsinventory-shorttag.patch ---
diff -up OCSNG_UNIX_SERVER-1.3.2/ocsreports/blacklist.php.orig OCSNG_UNIX_SERVER-1.3.2/ocsreports/blacklist.php
--- OCSNG_UNIX_SERVER-1.3.2/ocsreports/blacklist.php.orig 2010-05-13 08:00:03.000000000 +0200
+++ OCSNG_UNIX_SERVER-1.3.2/ocsreports/blacklist.php 2010-05-13 08:00:17.000000000 +0200
@@ -13,7 +13,7 @@ if (isset($_GET['choise'])) $_POST['choo
?>
<script language=javascript>
function confirme(did){
- if(confirm("<?echo $l->g(640)?> id "+did+" ?"))
+ if(confirm("<?php echo $l->g(640)?> id "+did+" ?"))
window.location="index.php?multi=<?php echo $_GET["multi"]?>&choise=<?php echo $_POST['choose_blacklist']?>&suppAcc="+did;
}
function convertToUpper(v_string){
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-reports.conf
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/EL-6/ocsinventory-reports.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ocsinventory-reports.conf 25 Jul 2008 16:53:07 -0000 1.2
+++ ocsinventory-reports.conf 19 Jun 2010 06:17:17 -0000 1.3
@@ -39,7 +39,7 @@ Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORT
# Uncomment following to force use of HTTPS in Administration Server
#SSLRequireSSL
- php_flag short_open_tag on
+ #php_flag short_open_tag on
php_flag file_uploads on
# Some PHP tuning for deployement feature up to 50 MB
Index: ocsinventory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/EL-6/ocsinventory.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocsinventory.spec 18 Feb 2010 18:07:32 -0000 1.13
+++ ocsinventory.spec 19 Jun 2010 06:17:18 -0000 1.14
@@ -5,24 +5,27 @@
%endif
# Remember to change this and Source0 for each release. thanks to launchpad :(
-%global tarname OCSNG_UNIX_SERVER-1.3.1
+%global tarname OCSNG_UNIX_SERVER
Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
-Version: 1.3.1
-Release: 1%{?dist}
+Version: 1.3.2
+Release: 3%{?dist}
Group: Applications/Internet
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.1/+download/OCSNG_UNIX_SERVER-1.3.1.tar.gz
+Source0: http://launchpad.net/ocsinventory-server/stable-1.3/%{version}/+download/%{tarname}-%{version}.tar.gz
Source1: ocsinventory-reports.conf
-Patch0: ocsinventory-schema.patch
+Patch0: %{name}-shorttag.patch
+# Upstream patch from Bzr
+Patch1: %{name}-upstream.patch
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +56,8 @@ the administration console and the datab
%description -l fr
Open Computer and Software Inventory Next Generation est une application
-destinée à aider l'administrateur système ou réseau à garder un oeil
-sur la configuration des machines du réseau et sur les logiciels qui y
-sont installés.
+destinée à aider l'administrateur système ou réseau à surveiller la
+configuration des machines du réseau et les logiciels qui y sont installés.
OCS Inventory est aussi capable de détecter tout périphérique actif sur
le réseau, comme les commutateurs, routeurs, imprimantes et autres matériels
@@ -64,7 +66,7 @@ autonomes.
OCS Inventory NG intègre des fonctionnalités de télédiffusion de paquets
sur les machines clients.
-ocsinventory est un metapaquet qui installera le serveur de communication,
+ocsinventory est un méta-paquet qui installera le serveur de communication,
la console d'administration et le serveur de base de données (MySQL).
@@ -129,9 +131,11 @@ navigateur favori.
%prep
-%setup -q -n %{tarname}
+%setup -q -n %{tarname}-%{version}
-%patch0 -p0
+%patch0 -p1
+cd ocsreports
+%patch1 -p0
%build
@@ -280,6 +284,12 @@ fi
%changelog
+* Sat Jun 19 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.2-3
+- update to new version
+- remove schema patch (upstream)
+- remove shorttag option
+- new upstream patches
+
* Thu Feb 18 2010 Remi Collet <Fedora at famillecollet.com> 1.3.1-1
- update to new version
- improved patch for schema
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/EL-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 18 Feb 2010 18:07:32 -0000 1.7
+++ sources 19 Jun 2010 06:17:18 -0000 1.8
@@ -1 +1 @@
-cef3d4204a4b2a02d89a9801e373c11e OCSNG_UNIX_SERVER-1.3.1.tar.gz
+aa933f6d9f2bc6071dc3f9f0e669ab33 OCSNG_UNIX_SERVER-1.3.2.tar.gz
--- ocsinventory-schema.patch DELETED ---
- Previous message: rpms/ocsinventory/EL-4 ocsinventory-shorttag.patch, NONE, 1.1 ocsinventory-upstream.patch, NONE, 1.1 ocsinventory-reports.conf, 1.2, 1.3 ocsinventory.spec, 1.8, 1.9 sources, 1.7, 1.8 ocsinventory-schema.patch, 1.1, NONE
- Next message: File Net-SSLGlue-0.4.tar.gz uploaded to lookaside cache by remi
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list