From afe20f4ac7144d0204d6bdfe87d11c12a90407d87c37bd0e29f8d695504d89f0 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Sun, 13 Oct 2013 14:23:31 +0000 Subject: [PATCH] Accepting request 203079 from home:MargueriteSu:branches:devel:libraries:c_c++ some clean, add provides: leveldb to libleveldb1 OBS-URL: https://build.opensuse.org/request/show/203079 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/leveldb?expand=0&rev=2 --- leveldb.changes | 9 ++++++++ leveldb.spec | 55 ++++++++++++++++++++----------------------------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/leveldb.changes b/leveldb.changes index f0b6140..edcd167 100644 --- a/leveldb.changes +++ b/leveldb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Oct 13 07:59:03 UTC 2013 - i@marguerite.su + +- ran spec-cleaner. too casual the specfile was. +- make check/make clean is no more for OBS. +- add Provides/Obsoletes to libleveldb1. + * no one know that name, provide leveldb itself + * required by python-leveldb and python3-leveldb + ------------------------------------------------------------------- Tue Oct 8 10:42:43 UTC 2013 - ddiss@suse.com diff --git a/leveldb.spec b/leveldb.spec index 15f4e39..30de8d9 100644 --- a/leveldb.spec +++ b/leveldb.spec @@ -1,7 +1,7 @@ # # spec file for package leveldb # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,81 +15,71 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: leveldb Version: 1.14.0 -Release: 1 -# +Release: 0 License: BSD-3-Clause -Group: Development/Libraries/C and C++ -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ snappy-devel -# -Url: http://code.google.com/p/leveldb/ -Source: leveldb-%{version}.tar.gz -# Summary: A key/value-store +Url: http://code.google.com/p/leveldb/ +Group: Development/Libraries/C and C++ +Source: leveldb-%{version}.tar.gz +BuildRequires: gcc-c++ +BuildRequires: snappy-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build + %description leveldb implements a system for maintaining a persistent key/value store. %define lib_name libleveldb1 %package -n %{lib_name} -Group: Development/Libraries/C and C++ -# Summary: Shared library from leveldb +Group: Development/Libraries/C and C++ +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} + %description -n %{lib_name} leveldb implements a system for maintaining a persistent key/value store. This package holds the shared library of leveldb. %package devel -License: BSD-3-Clause +Summary: Development files for leveldb Group: Development/Libraries/C and C++ Requires: %{lib_name} = %{version} -# -Summary: Development files for leveldb + %description devel leveldb implements a system for maintaining a persistent key/value store. This package holds the development files for leveldb. %package devel-static -License: BSD-3-Clause +Summary: Development files for statically link leveldb Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -# -Summary: Development files for statically link leveldb + %description devel-static leveldb implements a system for maintaining a persistent key/value store. This package holds the development files for statically linking leveldb. %prep -%setup +%setup -q %build make %{?_smp_flags} OPT="%{optflags}" %install -%{__install} -d -m 0755 %{buildroot}%{_includedir} %{buildroot}%{_libdir} -# +install -d -m 0755 %{buildroot}%{_includedir} %{buildroot}%{_libdir} + cp -a \ libleveldb.a \ libleveldb.so* \ %{buildroot}%{_libdir} -# + cp -a include/leveldb %{buildroot}%{_includedir} find %{buildroot} -name \*.la -delete -print -%check -#make check - -%clean -rm -rf %{buildroot} - %post -n %{lib_name} -p /sbin/ldconfig %postun -n %{lib_name} -p /sbin/ldconfig @@ -100,8 +90,7 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %{_libdir}/libleveldb.so -%dir %{_includedir}/leveldb -%{_includedir}/leveldb/* +%{_includedir}/leveldb/ %doc AUTHORS LICENSE NEWS README TODO doc/* %files devel-static