rpms/ocsinventory/devel .cvsignore, 1.3, 1.4 ocsinventory.spec, 1.7, 1.8 sources, 1.3, 1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch, 1.1, NONE ocsinventory-r1447.patch, 1.1, NONE ocsinventory-r1462.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Tue Apr 21 16:26:02 UTC 2009
- Previous message: rpms/glpi-data-injection/devel .cvsignore, 1.4, 1.5 glpi-data-injection.spec, 1.4, 1.5 sources, 1.4, 1.5
- Next message: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.2, 1.3 leonidas-kde-theme.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21022
Modified Files:
.cvsignore ocsinventory.spec sources
Removed Files:
ocsinventory-r1413.patch ocsinventory-r1423.patch
ocsinventory-r1447.patch ocsinventory-r1462.patch
Log Message:
update to 1.02 finale release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 11 Oct 2008 08:46:00 -0000 1.3
+++ .cvsignore 21 Apr 2009 16:25:59 -0000 1.4
@@ -1 +1 @@
-OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+OCSNG_UNIX_SERVER-1.02.tar.gz
Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocsinventory.spec 26 Feb 2009 07:45:06 -0000 1.7
+++ ocsinventory.spec 21 Apr 2009 16:26:00 -0000 1.8
@@ -4,13 +4,13 @@
%define useselinux 0
%endif
-%define tarname OCSNG_UNIX_SERVER_1.02RC3
+%define tarname OCSNG_UNIX_SERVER-1.02
Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
Version: 1.02
-Release: 0.11.rc3%{?dist}
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2
@@ -19,18 +19,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
Source1: ocsinventory-reports.conf
-# Database Schema
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
-Patch0: ocsinventory-r1413.patch
-# Update Script
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
-Patch1: ocsinventory-r1423.patch
-# Missing Include
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
-Patch2: ocsinventory-r1447.patch
-# Clean XML
-# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
-Patch3: ocsinventory-r1462.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,7 +99,12 @@
Summary: OCS Inventory NG - Communication server
# From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib
Requires: php
-Requires: php-mysql php-zip php-xml php-gd
+Requires: php-mysql php-zip php-gd
+%if 0%{?rhel} == 4
+Requires: php-domxml
+%else
+Requires: php-xml
+%endif
# Required by the original setup script, but not detected automatically :
Requires: perl(DBD::mysql)
# Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -133,11 +126,6 @@
%prep
%setup -q -n %{tarname}
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-
%build
cd Apache
@@ -283,8 +271,11 @@
%changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-0.11.rc3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Apr 20 2009 Remi Collet <Fedora at famillecollet.com> 1.02-1
+- update to OCS Inventory NG 1.02 final release (internal version 5003)
+
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
- add r1447 and r1462 patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Oct 2008 08:46:01 -0000 1.3
+++ sources 21 Apr 2009 16:26:00 -0000 1.4
@@ -1 +1 @@
-f2f284d352c65095039abb88321cdf6e OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+abebc61ba04de0e36ec2283c04f17c0d OCSNG_UNIX_SERVER-1.02.tar.gz
--- ocsinventory-r1413.patch DELETED ---
--- ocsinventory-r1423.patch DELETED ---
--- ocsinventory-r1447.patch DELETED ---
--- ocsinventory-r1462.patch DELETED ---
- Previous message: rpms/glpi-data-injection/devel .cvsignore, 1.4, 1.5 glpi-data-injection.spec, 1.4, 1.5 sources, 1.4, 1.5
- Next message: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.2, 1.3 leonidas-kde-theme.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list