[canl-c] New upstream version 2.1.5.

[František Dvořák]

commit be79c751d7d369d36a83756c45df9b296ad181c0
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Fri Jun 27 00:22:03 2014 +0200

    New upstream version 2.1.5.

 .gitignore  |    1 +
 canl-c.spec |   22 +++++++++++++---------
 sources     |    2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc64731..eaf3e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /canl-c-2.1.2.tar.gz
 /canl-c-2.1.3.tar.gz
 /canl-c-2.1.4.tar.gz
+/canl-c-2.1.5.tar.gz
diff --git a/canl-c.spec b/canl-c.spec
index 844d1d9..59727af 100644
--- a/canl-c.spec
+++ b/canl-c.spec
@@ -1,6 +1,6 @@
 Name:           canl-c
-Version:        2.1.4
-Release:        2%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        EMI Common Authentication library - bindings for C
 
 License:        ASL 2.0
@@ -68,17 +68,17 @@ This package contains client and server examples of EMI caNl.
 
 
 %build
-perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module canl.c
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib}
 CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 # in -doc subpackage
-rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/README
-rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/canl.pdf
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_defaultdocdir}/%{name}-%{version}/README
+rm -f %{buildroot}%{_defaultdocdir}/%{name}-%{version}/canl.pdf
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %post -p /sbin/ldconfig
@@ -88,7 +88,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %files
-%doc LICENSE README project/ChangeLog
+%doc ChangeLog LICENSE README
 %{_libdir}/libcanl_c.so.2
 %{_libdir}/libcanl_c.so.2.*
 
@@ -104,6 +104,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Thu Jun 26 2014 František Dvořák <valtri at civ.zcu.cz> - 2.1.5-1
+- New upstream version
+- Consistent style with buildroot macro
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 6c39b00..3ba00ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83daa4f194d79d1410c0d73d966d2f4c  canl-c-2.1.4.tar.gz
+edb723c62feeb3cb25758719f615887b  canl-c-2.1.5.tar.gz