[ocsinventory/epel7] update to 2.1.2

[Remi Collet]

commit 3eeb5f40cf2c74c0411a04d42106f5415218270e
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jul 9 15:28:05 2014 +0200

    update to 2.1.2
    
    (cherry picked from commit 22ebddbe4797fca4f935c255ac52d993d6487306)

 .gitignore                       |    1 +
 ocsinventory-CVE-2014-4722.patch |   15 ---------------
 ocsinventory.spec                |   11 +++++------
 sources                          |    2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8836654..fdf6fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ OCSNG_UNIX_SERVER-1.3.2.tar.gz
 /OCSNG_UNIX_SERVER-2.0.5.tar.gz
 /OCSNG_UNIX_SERVER-2.1.tar.gz
 /OCSNG_UNIX_SERVER-2.1.1.tar.gz
+/OCSNG_UNIX_SERVER-2.1.2.tar.gz
diff --git a/ocsinventory.spec b/ocsinventory.spec
index 7bc56de..c19067a 100644
--- a/ocsinventory.spec
+++ b/ocsinventory.spec
@@ -16,8 +16,8 @@
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
-Version:     2.1.1
-Release:     3%{?dist}
+Version:     2.1.2
+Release:     1%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -30,9 +30,6 @@ Source1:     ocsinventory-reports.conf
 # Fix for httpd 2.4 (for new authz_core)
 Patch0:      ocsng-httpd24.patch
 
-# Security fix
-Patch1:      %{name}-CVE-2014-4722.patch
-
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -142,7 +139,6 @@ navigateur favori.
 %setup -q -n %{tarname}-%{version}
 
 %patch0 -p0
-%patch1 -p0
 
 chmod -x binutils/ocs-errors
 
@@ -312,6 +308,9 @@ fi
 
 
 %changelog
+* Wed Jul 09 2014 Remi Collet <remi at fedoraproject.org> - 2.1.2-1
+- update to 2.1.2
+
 * Wed Jul 09 2014 Remi Collet <remi at fedoraproject.org> - 2.1.1-3
 - XSS security fix for CVE-2014-4722
 
diff --git a/sources b/sources
index e66a03b..c8892bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0273eb67a1a4bfd86d9a6c962b0b5f9d  OCSNG_UNIX_SERVER-2.1.1.tar.gz
+3e57bc11030c1d8f9f2d77f696af635e  OCSNG_UNIX_SERVER-2.1.2.tar.gz