Resolve merge conflict in Botan.spec

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=29
This commit is contained in:
Jan Engelhardt 2012-01-28 18:48:48 +00:00 committed by Git OBS Bridge
parent d6aaff58da
commit 0d353cf381

View File

@ -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 <lloyd@randombit.net>
%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 <lloyd@randombit.net>
%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 <lloyd@randombit.net>
%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 \