From 0300c000ffac3d377dfefda34a07d9288bab6ad55832b56cbb65d16b51141c38 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Jun 2011 13:42:03 +0000 Subject: [PATCH] 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