[canl-c] New upstream version 2.1.2 and packaging improvements (perl, doc subpackage license).
František Dvořák
valtri at fedoraproject.org
Thu Aug 8 21:49:18 UTC 2013
commit 46a38441a6044438e961d36499822adf3cd3f9e3
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Thu Aug 8 23:48:16 2013 +0200
New upstream version 2.1.2 and packaging improvements (perl, doc subpackage license).
.gitignore | 1 +
canl-c.spec | 22 +++++++++++++++-------
sources | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ed6fa5..a82a5ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/canl-c-2.0.3.tar.gz
/canl-c-2.0.7.tar.gz
/canl-c-2.1.1.tar.gz
+/canl-c-2.1.2.tar.gz
diff --git a/canl-c.spec b/canl-c.spec
index b222ed0..fbabbe8 100644
--- a/canl-c.spec
+++ b/canl-c.spec
@@ -1,6 +1,6 @@
Name: canl-c
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: EMI Common Authentication library - bindings for C
License: ASL 2.0
@@ -13,6 +13,9 @@ BuildRequires: flex
BuildRequires: krb5-devel%{?_isa}
BuildRequires: libtool
BuildRequires: openssl-devel%{?_isa}
+BuildRequires: perl
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(POSIX)
BuildRequires: pkgconfig
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
BuildRequires: tex(latex)
@@ -31,8 +34,7 @@ BuildRequires: tex(ucrr8a.pfb)
%endif
%description
-This is the C part of the EMI caNl -- the Common Authentication
-Library.
+This is the C part of the EMI caNl -- the Common Authentication Library.
%package devel
@@ -67,7 +69,7 @@ This package contains client and server examples of EMI caNl.
%build
-/usr/bin/perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module canl.c
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module canl.c
CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make
@@ -78,6 +80,7 @@ CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make check
%install
make install DESTDIR=$RPM_BUILD_ROOT
# in -doc subpackage
+rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/README
rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/canl.pdf
find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
@@ -90,7 +93,7 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
%files
-%doc LICENSE project/ChangeLog
+%doc LICENSE README project/ChangeLog
%{_libdir}/libcanl_c.so.2
%{_libdir}/libcanl_c.so.2.*
@@ -99,13 +102,18 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
%{_libdir}/libcanl_c.so
%files doc
-%doc canl.pdf
+%doc LICENSE canl.pdf
%files examples
%{_bindir}/*
%changelog
+* Thu Aug 08 2013 František Dvořák <valtri at civ.zcu.cz> - 2.1.2-1
+- New upstream version
+- Proper perl usage
+- Added README file
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 04a72cf..06e4e0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7749d9d757ded438b6a627bb3c1813cc canl-c-2.1.1.tar.gz
+6cdeb1b736be8000944367ff77c7cc05 canl-c-2.1.2.tar.gz
More information about the scm-commits
mailing list