[polarssl/f17] polarssl-1.1.1

[Mads Kiilerich]

commit 9bd187b84bd2cfb6df610f98f192637c146e2098
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Fri Mar 16 00:37:42 2012 +0100

    polarssl-1.1.1
    
    - Remove old hacks and patches
    - New -utils subpackage

 .gitignore                        |    1 +
 polarssl-cmake-doxygen.patch      |   26 ----------
 polarssl-cmake-shared.patch       |   34 -------------
 polarssl-cmake-with-install.patch |   97 -------------------------------------
 polarssl.spec                     |   55 +++++++++++----------
 sources                           |    2 +-
 6 files changed, 32 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c4251d7..b6fd7cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /polarssl-0.14.0-gpl.tgz
 /polarssl-0.14.1-gpl.tgz
 /polarssl-0.14.3-gpl.tgz
+/polarssl-1.1.1-gpl.tgz
diff --git a/polarssl.spec b/polarssl.spec
index eab3643..3d291d7 100644
--- a/polarssl.spec
+++ b/polarssl.spec
@@ -1,21 +1,16 @@
 Name:           polarssl
-Version:        0.14.3
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        Light-weight cryptographic and SSL/TLS library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://polarssl.org/
 Source0:        http://polarssl.org/code/releases/%{name}-%{version}-gpl.tgz
-# Patches sent upstream in private mail 2010-09-15 for inclusion in 0.15
-# Add cmake install targets:
-Patch1:         polarssl-cmake-with-install.patch
-# Add cmake flag for building and using shared library:
-Patch2:         polarssl-cmake-shared.patch
-# Add cmake target "apidoc" for creating doxygen API documentation:
-Patch3:         polarssl-cmake-doxygen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  cmake doxygen
+BuildRequires:  cmake
+BuildRequires:  doxygen
+BuildRequires:  graphviz
 
 %description
 PolarSSL is a light-weight open source cryptographic and SSL/TLS
@@ -24,10 +19,19 @@ cryptographic and SSL/TLS capabilities in their (embedded)
 applications with as little hassle as possible.
 
 
+%package        utils
+Summary:        Utilities for %{name}
+Group:          Applications/System
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    utils
+Cryptographic utilities based on %{name}. 
+
+
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -36,22 +40,15 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 
 %build
-%cmake -D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
-make VERBOSE=1 %{?_smp_mflags}
-make VERBOSE=1 apidoc
-rm include/apidoc/installdox
-sed -i 's,
$,,g' ChangeLog
+%cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
+make %{?_smp_mflags} all apidoc
 
 
 %check
-# Tests are not stable on 64-bit
-#ctest --output-on-failure
+ctest --output-on-failure
 
 
 %install
@@ -72,18 +69,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog
-%{_libexecdir}/polarssl/
+%doc LICENSE ChangeLog
 %{_libdir}/*.so.*
 
+%files utils
+%defattr(-,root,root,-)
+%{_libexecdir}/%{name}/
+
 %files devel
 %defattr(-,root,root,-)
-%doc include/apidoc/*
-%{_includedir}/polarssl/
+%doc apidoc/*
+%{_includedir}/%{name}/
 %{_libdir}/*.so
 
 
 %changelog
+* Thu Mar 15 2012 Mads Kiilerich <mads at kiilerich.com> - 1.1.1-1
+- polarssl-1.1.1
+- Remove old hacks and patches
+- New -utils subpackage
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 30d640b..58205c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1b2fe9087ab64d7ea40a276a3628583  polarssl-0.14.3-gpl.tgz
+f1f25a261ea677602a0a08c5c4f50166  polarssl-1.1.1-gpl.tgz