[canl-c] New upstream version 2.1.4.

[František Dvořák]

commit 2248ed830f8233138cb5bd4207340743c416e130
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Tue May 6 22:32:11 2014 +0200

    New upstream version 2.1.4.

 .gitignore       |    1 +
 canl-c.spec      |   13 +++++++------
 sources          |    2 +-
 tex-comment.diff |   28 ----------------------------
 4 files changed, 9 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8963be6..cc64731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /canl-c-2.1.1.tar.gz
 /canl-c-2.1.2.tar.gz
 /canl-c-2.1.3.tar.gz
+/canl-c-2.1.4.tar.gz
diff --git a/canl-c.spec b/canl-c.spec
index dda8de3..1fde0e1 100644
--- a/canl-c.spec
+++ b/canl-c.spec
@@ -1,13 +1,11 @@
 Name:           canl-c
-Version:        2.1.3
-Release:        2%{?dist}
+Version:        2.1.4
+Release:        1%{?dist}
 Summary:        EMI Common Authentication library - bindings for C
 
 License:        ASL 2.0
-Url:            http://www.eu-emi.eu
+URL:            http://www.eu-emi.eu
 Source:         http://scientific.zcu.cz/emi/emi.canl.c/%{name}-%{version}.tar.gz
-# https://github.com/CESNET/canl-c/commit/510d219cc8646370af85d3cbc9790c550f6a57fc
-Patch0:         tex-comment.diff
 
 BuildRequires:  bison
 BuildRequires:  c-ares-devel
@@ -67,7 +65,6 @@ This package contains client and server examples of EMI caNl.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -107,6 +104,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Tue May 06 2014 František Dvořák <valtri at civ.zcu.cz> - 2.1.4-1
+- New upstream version
+- Remove patch merged in upstream
+
 * Wed Jan 29 2014 František Dvořák <valtri at civ.zcu.cz> - 2.1.3-2
 - Patch to remove comment.sty LaTeX package (not available on RHEL7)
 
diff --git a/sources b/sources
index ec0f83f..6c39b00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77ab56da4ee3b67d12706d98d9a554fb  canl-c-2.1.3.tar.gz
+83daa4f194d79d1410c0d73d966d2f4c  canl-c-2.1.4.tar.gz