From 0d353cf381658ee4b9ad2344fd594600a4a0aa0d147eecd7afbf292e0ddb3815 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jan 2012 18:48:48 +0000 Subject: [PATCH] Resolve merge conflict in Botan.spec OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=29 --- Botan.spec | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/Botan.spec b/Botan.spec index 0d2efe0..0a4d92e 100644 --- a/Botan.spec +++ b/Botan.spec @@ -1,7 +1,7 @@ # # spec file for package Botan # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Version: 1.10.0 Release: 3 Url: http://botan.randombit.net Summary: A C++ Crypto Library -License: BSD3c +License: BSD-3-Clause Group: Development/Libraries/C and C++ Source: Botan-1.10.0.tar.bz2 Source2: baselibs.conf @@ -46,15 +46,7 @@ cryptographic operations, including encryption, authentication, and X.509v3 certificates and CRLs. A wide variety of algorithms is supported, including RSA, DSA, DES, AES, MD5, and SHA-1. - - -Authors: --------- - Jack Lloyd - %package -n libbotan-%{version_suffix} - -License: BSD3c Summary: A C++ Crypto Library Group: Development/Libraries/C and C++ @@ -64,14 +56,7 @@ cryptographic operations, including encryption, authentication, and X.509v3 certificates and CRLs. A wide variety of algorithms is supported, including RSA, DSA, DES, AES, MD5, and SHA-1. - - -Authors: --------- - Jack Lloyd - %package -n libbotan-devel -License: BSD3c Summary: Development files for Botan Group: Development/Libraries/C and C++ Requires: gmp-devel libbz2-devel @@ -85,12 +70,6 @@ Requires: libbotan-%{version_suffix} = %{version} This package contains the header files and libraries needed to develop programs that use the Botan library. - - -Authors: --------- - Name: Jack Lloyd - %prep %setup -q %patch0 @@ -103,7 +82,7 @@ Authors: %build export RPM_OPT_FLAGS %define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl -./configure.py --prefix=/usr --libdir=%{_libdir} \ +./configure.py --prefix=%_prefix --libdir=%{_libdir} \ --docdir=%{_defaultdocdir} \ --includedir=%{_includedir} \ --with-bzip2 \