[canl-c/el5: 4/4] Merge branch 'master' into el5.

[František Dvořák]

commit 4e8faacd11f718a83ca691880f023a02e4f40849
Merge: 713a29b 2248ed8
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Tue May 6 23:35:31 2014 +0200

    Merge branch 'master' into el5.

 .gitignore  |    1 +
 canl-c.spec |   14 ++++++++++----
 sources     |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --cc canl-c.spec
index 0fe51b2,1fde0e1..161944e
--- a/canl-c.spec
+++ b/canl-c.spec
@@@ -3,11 -3,9 +3,11 @@@ Version:        2.1.
  Release:        1%{?dist}
  Summary:        EMI Common Authentication library - bindings for C
  
 +Group:          System Environment/Libraries
  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
 +BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
  BuildRequires:  bison
  BuildRequires:  c-ares-devel
@@@ -124,12 -116,9 +130,12 @@@ rm -rf $RPM_BUILD_ROO
  - Removed arch-specific BuildRequires
  - EPEL 7 support
  - Enabled parallel build
- - Removed %check target
+ - Removed %%check target
  - Replaced find command by wildcards
  
 +* Tue Sep 24 2013 František Dvořák <valtri at civ.zcu.cz> - 2.1.2-1
 +- EPEL 5 packaging
 +
  * Thu Aug 08 2013 František Dvořák <valtri at civ.zcu.cz> - 2.1.2-1
  - New upstream version
  - Proper perl usage