[aws] Recommit Disable gnutls (#918554)

Pavel Zhukov landgraf at fedoraproject.org
Wed Mar 13 14:38:23 UTC 2013


commit 7d0e84e679625e070d33f456b46d99a6b2c1bad2
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Wed Mar 13 15:38:22 2013 +0100

    Recommit Disable gnutls (#918554)

 aws.spec |   18 +++++++++++-------
 sources  |    2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/aws.spec b/aws.spec
index faad448..2a2050c 100644
--- a/aws.spec
+++ b/aws.spec
@@ -1,10 +1,7 @@
-## TODO: 
-## build docs
-## enable LDAP support
-
+%global with_gnutls 0
 Name:       aws 
 Version:    2.11.0
-Release:    14%{?dist}
+Release:    16%{?dist}
 Summary:    Ada Web Server
 
 Group:      System Environment/Libraries
@@ -26,7 +23,11 @@ Patch1:     %{name}-%{version}-ipv6.patch
 Patch2:     %{name}-%{version}-remove_null_functions.patch
 BuildRequires:   fedora-gnat-project-common  >= 3
 BuildRequires:   gcc-gnat
-BuildRequires:   gprbuild xmlada-devel gnutls-devel zlib-ada-devel
+BuildRequires:   gprbuild xmlada-devel 
+%if %{with_gnutls}
+BuildRequires:   gnutls-devel 
+%endif
+BuildRequires:   zlib-ada-devel
 BuildRequires:   templates_parser-devel openldap-devel
 # gcc-gnat only available on these:
 ExclusiveArch: %{GNAT_arches}
@@ -126,7 +127,10 @@ cd  %{buildroot}/%{_libdir}/ && ln -s %{name}/lib%{name}.so* .
 
 
 %changelog
-* Sun Mar 10 2013  Pavel Zhukov <landgraf at fedoraproject.org> - 2.11.0-13
+* Wed Mar 13 2013  Pavel Zhukov <landgraf at fedoraproject.org> - 2.11.0-16
+- Disable gnutls support (rhbz#918554)
+
+* Sun Mar 10 2013  Pavel Zhukov <landgraf at fedoraproject.org> - 2.11.0-15
 - Rebuild with new xmlada
 
 * Wed Mar  6 2013 Tomáš Mráz <tmraz at redhat.com> 2.11.0-14
diff --git a/sources b/sources
index 06406b7..5ccdcb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9294f5d3f2a0fa7476221edfb69a19ab  aws-fedora.tgz
+24a897f1f946c01d890753745aea02e0  aws-fedora.tgz
 60d9667b9f9eac079e6d5c67cd859248  aws-gpl-2.11.0-src.tgz


More information about the scm-commits mailing list