From 0d353cf381658ee4b9ad2344fd594600a4a0aa0d147eecd7afbf292e0ddb3815 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jan 2012 18:48:48 +0000 Subject: [PATCH 1/2] 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 \ From 6be638a8315f592a92dcac67459c358f9aad2d786884a6c3164b17f41f270682 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 7 Feb 2012 08:04:15 +0000 Subject: [PATCH 2/2] - little spec cleanup OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=30 --- Botan.changes | 5 +++++ Botan.spec | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Botan.changes b/Botan.changes index 992ac8b..f2dc09a 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 7 08:04:05 UTC 2012 - coolo@suse.com + +- little spec cleanup + ------------------------------------------------------------------- Fri Sep 16 17:36:04 UTC 2011 - jengelh@medozas.de diff --git a/Botan.spec b/Botan.spec index 0a4d92e..8a80596 100644 --- a/Botan.spec +++ b/Botan.spec @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define version_suffix 1_10-0 %define short_version 1.10 Name: Botan Version: 1.10.0 -Release: 3 +Release: 0 Url: http://botan.randombit.net Summary: A C++ Crypto Library License: BSD-3-Clause @@ -36,9 +35,16 @@ Patch5: Botan-qt_thread_support.patch Patch6: Botan-fix_pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1 -BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel -BuildRequires: gcc-c++ gmp-devel libbz2-devel openssl-devel python -BuildRequires: libqt4-devel pkg-config +BuildRequires: bzip2 >= 1.0.2 +BuildRequires: gcc-c++ +BuildRequires: gmp-devel +BuildRequires: gmp-devel >= 4.1 +BuildRequires: libbz2-devel +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: zlib-devel %description Botan is a C++ library that provides support for many common