[packages/ocs-inventory-ng] - updated to 2.0.5
adamg
adamg at pld-linux.org
Fri Feb 22 19:05:32 CET 2013
commit cc785fb9f2347ed0a2cb3e1807a75cc10932efe1
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Fri Feb 22 19:05:28 2013 +0100
- updated to 2.0.5
ocs-inventory-ng-config.patch | 76 ++++++++++++++++++++++---------------------
ocs-inventory-ng.spec | 31 ++++++++----------
2 files changed, 53 insertions(+), 54 deletions(-)
---
diff --git a/ocs-inventory-ng.spec b/ocs-inventory-ng.spec
index a871de0..30483ce 100644
--- a/ocs-inventory-ng.spec
+++ b/ocs-inventory-ng.spec
@@ -2,24 +2,20 @@
Summary: OCS-Inventory NG - keeping track of the configuration and installed software
Summary(pl.UTF-8): OCS-Inventory NG - śledzenie konfiguracji i zainstalowanego oprogramowania
Name: ocs-inventory-ng
-Version: 1.01
-Release: 0.1
+Version: 2.0.5
+Release: 0.0.1
License: GPL
Group: Applications
-Source0: http://dl.sourceforge.net/ocsinventory/OCSNG_LINUX_SERVER_%{version}.tar.gz
-# Source0-md5: 3a756080a409f7743937ffe1ab748a03
-Source2: http://dl.sourceforge.net/ocsinventory/OCS_Inventory_NG-Installation_and_Administration_Guide_1.9_EN.odt.zip
-# Source2-md5: ff62f5e3769b4f5670407d0085d064e5
-Source3: http://dl.sourceforge.net/ocsinventory/OCS_Inventory_NG-Installation_and_Administration_Guide_1.9_EN.pdf.zip
-# Source3-md5: cd1b2611f22f24223bb7c7b1fa095b12
+Source0: https://launchpad.net/ocsinventory-server/stable-2.0/2.0.5/+download/OCSNG_UNIX_SERVER-%{version}.tar.gz
+# Source0-md5: 349904d03494b8fd9fc4eea1d6859729
Source4: %{name}-client.conf
Source5: %{name}-client.adm
Source6: %{name}-client.cron
Source7: %{name}-client.logrotate
Patch0: %{name}-config.patch
URL: http://www.ocsinventory-ng.org/
-BuildRequires: perl-devel >= 1:5.6
BuildRequires: perl-ExtUtils-MakeMaker
+BuildRequires: perl-devel >= 1:5.6
BuildRequires: unzip
Requires: apache >= 1.3.33
Requires: apache-mod_perl >= 1.29
@@ -31,9 +27,11 @@ Requires: perl-DBI >= 1.40
Requires: perl-Net-IP >= 1.21
Requires: perl-XML-Simple >= 2.12
Requires: perl-base >= 1:5.6
-Requires: php-common >= 3:4.3.2
+Requires: php(core) >= 4.3.2
Requires: php-pecl-zip
Requires: webapps
+Suggests: perl-SOAP-Lite
+Suggests: perl-XML-Entities
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,7 +80,7 @@ zarządzania parkiem z automatycznym uaktualnianiem konfiguracji
komputerów, zarządzaniem licencjami, help deskiem itd.
%prep
-%setup -q -n OCSNG_LINUX_SERVER_%{version}
+%setup -q -n OCSNG_UNIX_SERVER-%{version}
%patch0 -p1
# undos the source
@@ -106,10 +104,10 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/logrotate.d,%{_var
install -d $RPM_BUILD_ROOT{%{_appdir},%{_webappconfdir}}
cp -Rf ocsreports/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-install Apache/logrotate.ocsinventory-NG $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ocs-inventory-ng
-install Apache/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/apache.conf
-install Apache/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/httpd.conf
-install ipdiscover-util/ipdiscover-util.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ipdiscover-util.pl
+install etc/logrotate.d/ocsinventory-server $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ocs-inventory-ng
+install etc/ocsinventory/ocsinventory-server.conf $RPM_BUILD_ROOT%{_webappconfdir}/apache.conf
+install etc/ocsinventory/ocsinventory-server.conf $RPM_BUILD_ROOT%{_webappconfdir}/httpd.conf
+install binutils/ipdiscover-util.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ipdiscover-util.pl
%clean
rm -rf $RPM_BUILD_ROOT
@@ -128,12 +126,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README ocs-errors $SOURCE2 $SOURCE3
+%doc README binutils/ocs-errors binutils/*.README
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ocs-inventory-ng
%attr(750,root,http) %dir %{_webappconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappconfdir}/httpd.conf
-%attr(755,root,root) %{_bindir}/Ocsinventory_local.pl
%{_datadir}/%{name}/
%dir %{perl_vendorlib}/Apache/Ocsinventory
%{perl_vendorlib}/Apache/Ocsinventory/*
diff --git a/ocs-inventory-ng-config.patch b/ocs-inventory-ng-config.patch
index 06fe7e7..60035a0 100644
--- a/ocs-inventory-ng-config.patch
+++ b/ocs-inventory-ng-config.patch
@@ -1,37 +1,39 @@
-diff -urN OCSNG_LINUX_SERVER_1.01.orig/Apache/logrotate.ocsinventory-NG OCSNG_LINUX_SERVER_1.01/Apache/logrotate.ocsinventory-NG
---- OCSNG_LINUX_SERVER_1.01.orig/Apache/logrotate.ocsinventory-NG 2006-04-15 11:38:05.000000000 +0200
-+++ OCSNG_LINUX_SERVER_1.01/Apache/logrotate.ocsinventory-NG 2007-05-09 10:36:19.000000000 +0200
-@@ -15,7 +15,8 @@
- #
- # Rotate OCS Inventory NG Communication server logs weekly, only if not empty
- # Save 7 days old logs under compressed mode
--PATH_TO_LOG_DIRECTORY/*.log {
-+/var/log/ocs-inventory-ng/*.log {
-+ create 660 root http
- daily
- rotate 7
- compress
-diff -urN OCSNG_LINUX_SERVER_1.01.orig/Apache/ocsinventory.conf OCSNG_LINUX_SERVER_1.01/Apache/ocsinventory.conf
---- OCSNG_LINUX_SERVER_1.01.orig/Apache/ocsinventory.conf 2007-02-20 09:00:23.000000000 +0100
-+++ OCSNG_LINUX_SERVER_1.01/Apache/ocsinventory.conf 2007-05-09 10:37:09.000000000 +0200
-@@ -13,16 +13,16 @@
- # Which version of mod_perl we are using
- # For mod_perl <= 1.999_21, replace VERSION_MP by 1
- # For mod_perl > 1.999_21, replace VERSION_MP by 2
--PerlSetEnv OCS_MODPERL_VERSION VERSION_MP
-+PerlSetEnv OCS_MODPERL_VERSION 2
-
- # Where to write detailled logs
--PerlSetEnv OCS_LOGPATH "PATH_TO_LOG_DIRECTORY"
-+PerlSetEnv OCS_LOGPATH "/var/log/ocs-inventory-ng"
-
- # Database options
- # Replace DATABASE_SERVER by hostname or ip of MySQL server, generally localhost
--PerlSetEnv OCS_DB_HOST DATABASE_SERVER
-+PerlSetEnv OCS_DB_HOST localhost
- # Replace DATABASE_PORT by port where running MySQL server, generally 3306
--PerlSetEnv OCS_DB_PORT DATABASE_PORT
-+PerlSetEnv OCS_DB_PORT 3306
- # Name of database
- PerlSetEnv OCS_DB_NAME ocsweb
- PerlSetEnv OCS_DB_LOCAL ocsweb
+--- OCSNG_UNIX_SERVER-2.0.5/etc/logrotate.d/ocsinventory-server~ 2012-04-01 16:05:55.000000000 +0200
++++ OCSNG_UNIX_SERVER-2.0.5/etc/logrotate.d/ocsinventory-server 2013-02-22 18:53:25.250736649 +0100
+@@ -1,6 +1,7 @@
+ # Rotate OCS Inventory NG Communication server logs daily
+ # Save 7 days old logs in compressed mode
+-PATH_TO_LOG_DIRECTORY/*.log {
++/var/log/ocs-inventory-ng/*.log {
++ create 660 root http
+ daily
+ rotate 7
+ compress
+--- OCSNG_UNIX_SERVER-2.0.5/etc/ocsinventory/ocsinventory-server.conf~ 2012-04-01 16:05:55.000000000 +0200
++++ OCSNG_UNIX_SERVER-2.0.5/etc/ocsinventory/ocsinventory-server.conf 2013-02-22 18:57:27.845324225 +0100
+@@ -15,13 +15,13 @@
+ # Which version of mod_perl we are using
+ # For mod_perl <= 1.999_21, replace VERSION_MP by 1
+ # For mod_perl > 1.999_21, replace VERSION_MP by 2
+- PerlSetEnv OCS_MODPERL_VERSION VERSION_MP
++ PerlSetEnv OCS_MODPERL_VERSION 2
+
+ # Master Database settings
+ # Replace DATABASE_SERVER by hostname or ip of MySQL server for WRITE
+- PerlSetEnv OCS_DB_HOST DATABASE_SERVER
++ PerlSetEnv OCS_DB_HOST localhost
+ # Replace DATABASE_PORT by port where running MySQL server, generally 3306
+- PerlSetEnv OCS_DB_PORT DATABASE_PORT
++ PerlSetEnv OCS_DB_PORT 3306
+ # Name of database
+ PerlSetEnv OCS_DB_NAME ocsweb
+ PerlSetEnv OCS_DB_LOCAL ocsweb
+@@ -44,7 +44,7 @@
+ # PerlSetVar OCS_DB_SL_PWD ocs
+
+ # Path to log directory (must be writeable)
+- PerlSetEnv OCS_OPT_LOGPATH "PATH_TO_LOG_DIRECTORY"
++ PerlSetEnv OCS_OPT_LOGPATH "/var/log/ocs-inventory-ng/"
+
+ # If you need to specify a mysql socket that the client's built-in
+ #PerlSetEnv OCS_OPT_DBI_MYSQL_SOCKET "path/to/mysql/unix/socket"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocs-inventory-ng.git/commitdiff/cc785fb9f2347ed0a2cb3e1807a75cc10932efe1
More information about the pld-cvs-commit
mailing list