rpms/ocsinventory/F-13 ocsinventory-shorttag.patch, NONE, 1.1 ocsinventory-reports.conf, 1.2, 1.3 ocsinventory.spec, 1.14, 1.15 sources, 1.8, 1.9 ocsinventory-schema.patch, 1.2, NONE
Remi Collet
remi at fedoraproject.org
Thu May 13 10:25:08 UTC 2010
- Previous message: rpms/tigervnc/F-13 tigervnc11-ldnow.patch, NONE, 1.1 tigervnc11-libvnc.patch, NONE, 1.1 tigervnc11-rh586406.patch, NONE, 1.1 tigervnc.spec, 1.34, 1.35
- Next message: rpms/perl-DateTime-Format-DateManip/devel DateTime-Format-DateManip-01conversion.patch, NONE, 1.1 perl-DateTime-Format-DateManip.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/pkgs/rpms/ocsinventory/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6442
Modified Files:
ocsinventory-reports.conf ocsinventory.spec sources
Added Files:
ocsinventory-shorttag.patch
Removed Files:
ocsinventory-schema.patch
Log Message:
update to 1.3.2
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){
Index: ocsinventory-reports.conf
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory/F-13/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 13 May 2010 10:25:08 -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/F-13/ocsinventory.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocsinventory.spec 18 Feb 2010 17:58:03 -0000 1.14
+++ ocsinventory.spec 13 May 2010 10:25:08 -0000 1.15
@@ -5,13 +5,13 @@
%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
+Version: 1.3.2
Release: 1%{?dist}
Group: Applications/Internet
@@ -19,10 +19,10 @@ 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
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +53,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 +63,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 +128,9 @@ navigateur favori.
%prep
-%setup -q -n %{tarname}
+%setup -q -n %{tarname}-%{version}
-%patch0 -p0
+%patch0 -p1
%build
@@ -280,6 +279,11 @@ fi
%changelog
+* Thu May 13 2010 Remi Collet <Fedora at famillecollet.com> 1.3.2-1
+- update to new version
+- remove schema patch (upstream)
+- remove shorttag option
+
* 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/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 18 Feb 2010 17:58:03 -0000 1.8
+++ sources 13 May 2010 10:25:08 -0000 1.9
@@ -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/tigervnc/F-13 tigervnc11-ldnow.patch, NONE, 1.1 tigervnc11-libvnc.patch, NONE, 1.1 tigervnc11-rh586406.patch, NONE, 1.1 tigervnc.spec, 1.34, 1.35
- Next message: rpms/perl-DateTime-Format-DateManip/devel DateTime-Format-DateManip-01conversion.patch, NONE, 1.1 perl-DateTime-Format-DateManip.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list