rpms/ocsinventory/devel ocsinventory-r1413.patch, NONE, 1.1 ocsinventory.spec, 1.3, 1.4
Remi Collet
remi at fedoraproject.org
Sat Oct 11 16:41:37 UTC 2008
Author: remi
Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12100
Modified Files:
ocsinventory.spec
Added Files:
ocsinventory-r1413.patch
Log Message:
post RC3 patch
ocsinventory-r1413.patch:
--- NEW FILE ocsinventory-r1413.patch ---
--- trunk/server/ocsreports/files/ocsbase.sql 2008/09/26 13:07:51 1390
+++ trunk/server/ocsreports/files/ocsbase.sql 2008/10/11 15:31:04 1413
@@ -699,6 +699,11 @@
ALTER TABLE subnet ADD INDEX ID(ID);
ALTER TABLE hardware CHANGE QUALITY QUALITY DECIMAL(7,4) default NULL;
+ALTER TABLE groups change REVALIDATE_FROM REVALIDATE_FROM INT default 0;
+ALTER TABLE groups change CREATE_TIME CREATE_TIME INT default 0;
+UPDATE groups SET CREATE_TIME=0 WHERE CREATE_TIME IS NULL;
+UPDATE groups SET REVALIDATE_FROM=0 WHERE REVALIDATE_FROM IS NULL;
+
DELETE FROM config WHERE name='GUI_VERSION';
DELETE FROM config WHERE name='IP_MIN_QUALITY';
@@ -723,9 +728,13 @@
INSERT INTO config VALUES ('DOWNLOAD_TIMEOUT', 30, '', 'Validity of a package (in days)');
INSERT INTO config VALUES ('LOCAL_SERVER', 0, 'localhost', 'Server address used for local import');
INSERT INTO config VALUES ('LOCAL_PORT', 80, '', 'Server port used for local import');
+INSERT INTO config VALUES ('DOWNLOAD_PACK_DIR','','/var/lib/ocsinventory-reports','Directory for download files');
+INSERT INTO config VALUES ('IPDISCOVER_IPD_DIR','','/var/lib/ocsinventory-reports','Directory for Ipdiscover files');
+
INSERT INTO blacklist_serials(SERIAL) VALUES ('N/A'),('(null string)'),('INVALID'),('SYS-1234567890'),('SYS-9876543210'),('SN-12345'),('SN-1234567890'),('1111111111'),('1111111'),('1'),('0123456789'),('12345'),('123456'),('1234567'),('12345678'),('123456789'),('1234567890'),('123456789000'),('12345678901234567'),('0000000000'),('000000000'),('00000000'),('0000000'),('000000'),('NNNNNNN'),('xxxxxxxxxxx'),('EVAL'),('IATPASS'),('none'),('To Be Filled By O.E.M.'),('Tulip Computers'),('Serial Number xxxxxx'),('SN-123456fvgv3i0b8o5n6n7k'),('');
INSERT INTO blacklist_macaddresses(MACADDRESS) VALUES ('00:00:00:00:00:00'),('FF:FF:FF:FF:FF:FF'),('44:45:53:54:00:00'),('44:45:53:54:00:01'),('00:01:02:7D:9B:1C'),('00:08:A1:46:06:35'),('00:08:A1:66:E2:1A'),('00:09:DD:10:37:68'),('00:0F:EA:9A:E2:F0'),('00:10:5A:72:71:F3'),('00:11:11:85:08:8B'),('10:11:11:11:11:11'),('44:45:53:54:61:6F'),('');
+
INSERT INTO operators VALUES ('admin','admin','admin','admin',1, 'Default administrator account');
GRANT ALL PRIVILEGES ON ocsweb.* TO ocs IDENTIFIED BY 'ocs';
Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocsinventory.spec 11 Oct 2008 08:46:01 -0000 1.3
+++ ocsinventory.spec 11 Oct 2008 16:41:06 -0000 1.4
@@ -10,7 +10,7 @@
Summary: Open Computer and Software Inventory Next Generation
Version: 1.02
-Release: 0.7.rc3%{?dist}
+Release: 0.8.rc3%{?dist}
Group: Applications/Internet
License: GPLv2
@@ -19,6 +19,9 @@
Source0: http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
Source1: ocsinventory-reports.conf
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
+Patch0: ocsinventory-r1413.patch
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -120,12 +123,7 @@
%prep
%setup -q -n %{tarname}
-# Force GUI to use RPM default dir (RC3 regression reported upstream)
-cat <<EOSQL >>ocsreports/files/ocsbase.sql
-
-insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_PACK_DIR','','%{_localstatedir}/lib/ocsinventory-reports','RPM Directory for download files');
-insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_IPD_DIR','','%{_localstatedir}/lib/ocsinventory-reports','RPM Directory for Ipdiscover files');
-EOSQL
+%patch0 -p2
%build
@@ -272,6 +270,9 @@
%changelog
+* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.8.rc3
+- last minute patch
+
* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.7.rc3
- update to RC3
More information about the scm-commits
mailing list