From 7a20d1e80ae5d9484f3f01e6e8a18703d762bac14617ea8345f3fe7153191336 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 23 Jun 2011 09:44:13 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/Botan revision 16.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=2294fd0853537035ee2a6369cc07016d --- Botan.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Botan.spec b/Botan.spec index f4732b4..947d4ba 100644 --- a/Botan.spec +++ b/Botan.spec @@ -1,7 +1,7 @@ # -# spec file for package Botan (Version 1.8.10) +# spec file for package Botan # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -56,6 +56,7 @@ Authors: %package -n libbotan-%{version_suffix} + License: BSD3c Summary: A C++ Crypto Library Group: Development/Libraries/C and C++ @@ -73,6 +74,7 @@ Authors: Jack Lloyd %package %{short_version}-devel + License: BSD3c Summary: Development files for Botan Group: Development/Libraries/C and C++ From 0300c000ffac3d377dfefda34a07d9288bab6ad55832b56cbb65d16b51141c38 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Jun 2011 13:42:03 +0000 Subject: [PATCH 2/3] merge OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=23 --- Botan.changes | 6 ++++++ Botan.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Botan.changes b/Botan.changes index bd197d1..815570a 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 23 14:43:48 CEST 2011 - dmueller@suse.de + +- rename the devel package back to libbotan-devel as the main + package allows to build only one -devel package + ------------------------------------------------------------------- Wed Jun 22 16:10:32 CEST 2011 - pth@suse.de diff --git a/Botan.spec b/Botan.spec index 947d4ba..69ccb37 100644 --- a/Botan.spec +++ b/Botan.spec @@ -73,19 +73,18 @@ Authors: -------- Jack Lloyd -%package %{short_version}-devel - +%package -n libbotan-devel License: BSD3c Summary: Development files for Botan Group: Development/Libraries/C and C++ Requires: gmp-devel libbz2-devel -Provides: Botan-devel = %{version}, libbotan-devel = %{version} -Obsoletes: Botan-devel < %{version}, libbotan-devel < %{version} +Provides: Botan-devel = %{version} +Obsoletes: Botan-devel < %{version} Requires: libbotan-%{version_suffix} = %{version} %define botan_docdir %{_datadir}/doc/packages/%{name}-%{version} -%description %{short_version}-devel +%description -n libbotan-devel This package contains the header files and libraries needed to develop programs that use the Botan library. @@ -133,7 +132,7 @@ rm -f %{buildroot}/%{_libdir}/libbotan*.a %{botan_docdir}/* %{_libdir}/libbotan-%{short_version}.so.* -%files %{short_version}-devel +%files -n libbotan-devel %defattr(-,root,root) %{_libdir}/libbotan-%{short_version}.so %{_libdir}/pkgconfig/botan-%{short_version}.pc From 882de4a2a111299deabd7203e204858967605966162c5d27df98144cc58fd7fb Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 4 Jul 2011 15:14:52 +0000 Subject: [PATCH 3/3] - Make package own its docdir. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=24 --- Botan.changes | 5 +++++ Botan.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Botan.changes b/Botan.changes index 815570a..84ec2fe 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 4 17:14:21 CEST 2011 - pth@suse.de + +- Make package own its docdir. + ------------------------------------------------------------------- Thu Jun 23 14:43:48 CEST 2011 - dmueller@suse.de diff --git a/Botan.spec b/Botan.spec index 69ccb37..1fc7635 100644 --- a/Botan.spec +++ b/Botan.spec @@ -129,7 +129,7 @@ rm -f %{buildroot}/%{_libdir}/libbotan*.a %files -n libbotan-%{version_suffix} %defattr(-,root,root) %docdir %{botan_docdir} -%{botan_docdir}/* +%{botan_docdir} %{_libdir}/libbotan-%{short_version}.so.* %files -n libbotan-devel