rpms/ocsinventory-agent/EL-4 ocsinventory-agent-options.patch, 1.1, 1.2 ocsinventory-agent.spec, 1.1, 1.2 sources, 1.2, 1.3
Remi Collet
remi at fedoraproject.org
Thu May 7 13:02:19 UTC 2009
Author: remi
Update of /cvs/extras/rpms/ocsinventory-agent/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30600
Modified Files:
ocsinventory-agent-options.patch ocsinventory-agent.spec
sources
Log Message:
update to 1.0.1
ocsinventory-agent-options.patch:
Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-4/ocsinventory-agent-options.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocsinventory-agent-options.patch 10 Jun 2008 18:06:20 -0000 1.1
+++ ocsinventory-agent-options.patch 7 May 2009 13:01:48 -0000 1.2
@@ -1,6 +1,6 @@
---- ocsinventory-agent.orig 2008-04-02 20:27:42.000000000 +0200
-+++ ocsinventory-agent 2008-04-02 20:29:12.000000000 +0200
-@@ -86,7 +86,7 @@
+--- ocsinventory-agent.orig 2008-10-14 19:51:48.000000000 +0200
++++ ocsinventory-agent 2008-10-20 21:59:57.000000000 +0200
+@@ -88,7 +88,7 @@
"p|password=s" => \$params->{password},
"r|realm=s" => \$params->{realm},
"R|remotedir=s" => \$params->{remotedir},
@@ -8,8 +8,8 @@
+ "s|server=s" => \$params->{optserver},
"stdout" => \$params->{stdout},
"t|tag=s" => \$params->{tag},
- "u|user=s" => \$params->{user},
-@@ -215,6 +215,13 @@
+ "u|user=s" => \$params->{user},
+@@ -226,6 +226,12 @@
$params->{nosoftware} = 1
}
@@ -19,7 +19,6 @@
+ undef $params->{local};
+ undef $params->{optserver};
+}
-+
- if ($params->{server} !~ /^http(|s):\/\//) {
+
+ if (!$params->{'stdout'} && !$params->{'local'} && $params->{server} !~ /^http(|s):\/\//) {
$logger->debug("the --server passed doesn't have a protocle, assume http as default");
- $params->{server} = "http://".$params->{server}
Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-4/ocsinventory-agent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocsinventory-agent.spec 10 Jun 2008 18:06:20 -0000 1.1
+++ ocsinventory-agent.spec 7 May 2009 13:01:48 -0000 1.2
@@ -5,11 +5,11 @@
Name: ocsinventory-agent
Summary: Open Computer and Software Inventory Next Generation client
-Version: 0.0.9.2
-Release: 1%{?dist}%{?ocstag:.%{ocstag}}
+Version: 1.0.1
+Release: 2%{?dist}%{?ocstag:.%{ocstag}}
-#Source0: http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
-Source0: http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
+#Source0: http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
Source1: %{name}.logrotate
Source2: %{name}.cron
@@ -89,7 +89,7 @@ OCSMODE[0]=none
%endif
# can be used to override the %{name}.cfg setup.
-# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=your.ocsserver.name
#
# corresponds with --local=%{_localstatedir}/lib/%{name}
# OCSSERVER[0]=local
@@ -112,7 +112,7 @@ cat <<EOF >%{name}.cfg
server = http://%{ocsserver}/ocsinventory
%else
# Server URL, unconmment if needed
-# server = http://your.ocsserver.name/ocsinventory
+# server = your.ocsserver.name
local = %{_localstatedir}/lib/%{name}
%endif
@@ -187,6 +187,19 @@ rm -rf %{buildroot}
%changelog
+* Fri Apr 24 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-2
+- update the README.RPM (new configuration file)
+- change from URL to only servername in config comment
+
+* Sun Mar 29 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-1
+- update to 1.0.1
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-2
+- fix FTBFS (#465073)
+
* Sun Apr 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-1
- update to 0.0.9.2 (minor bug fix)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 10 Jun 2008 18:06:20 -0000 1.2
+++ sources 7 May 2009 13:01:48 -0000 1.3
@@ -1 +1 @@
-8c2ae7ce0505e571546ccc5b0cec353d Ocsinventory-Agent-nobundle-0.0.9.2.tar.gz
+749501586e0c634680c13000b3b2851e Ocsinventory-Agent-1.0.1.tar.gz
More information about the fedora-extras-commits
mailing list