rpms/ocsinventory/F-9 ocsinventory.spec,1.1,1.2
Remi Collet
remi at fedoraproject.org
Sat Oct 11 16:48:38 UTC 2008
Author: remi
Update of /cvs/extras/rpms/ocsinventory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14335
Modified Files:
ocsinventory.spec
Log Message:
post RC3 patch
Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-9/ocsinventory.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory.spec 11 Oct 2008 08:56:26 -0000 1.1
+++ ocsinventory.spec 11 Oct 2008 16:48:08 -0000 1.2
@@ -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