Accepting request 130650 from devel:libraries:c_c++

- Replace %makeinstall by make install; the former seldomly works
- kyoto requires at least i586 an arch; force it on RH6 (which
  defaults to i386) (forwarded request 130649 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/130650
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kyotocabinet?expand=0&rev=2
This commit is contained in:
Ismail Dönmez 2012-08-16 12:07:49 +00:00 committed by Git OBS Bridge
commit dde9726e2a
2 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Aug 11 14:19:14 UTC 2012 - jengelh@inai.de
- Replace %makeinstall by make install; the former seldomly works
- kyoto requires at least i586 an arch; force it on RH6 (which
defaults to i386)
-------------------------------------------------------------------
Tue Jul 31 12:45:52 UTC 2012 - cfarrell@suse.com

View File

@ -19,11 +19,11 @@
Name: kyotocabinet
Version: 1.2.76
Release: 0
License: SUSE-GPL-3.0-with-FLOSS-exception
%define soname 16
Summary: A straightforward implementation of DBM
Url: http://fallabs.com/kyotocabinet/
License: SUSE-GPL-3.0-with-FLOSS-exception
Group: Productivity/Databases/Tools
Url: http://fallabs.com/kyotocabinet/
Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: %{name}-fix_rpath.patch
@ -36,6 +36,10 @@ BuildRequires: pkgconfig
BuildRequires: zlib-devel
Requires: libkyotocabinet%{soname} = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if "%_target_cpu" == "i386"
# kyotocabinet uses __sync_* primitives and requires at least 586
BuildArch: i586
%endif
%description
Kyoto Cabinet is a library of routines for managing a database. The database
@ -107,11 +111,15 @@ sed -ie "/DOCDIR/d" Makefile.in
%build
autoreconf -iv
export CFLAGS="%optflags";
export CXXFLAGS="%optflags";
export CFLAGS="${CFLAGS//-march=i386/-march=i586}";
export CXXFLAGS="${CXXFLAGS//-march=i386/-march=i586}";
%configure
make %{?_smp_mflags}
%install
%makeinstall
make install DESTDIR="%buildroot"
rm -rf %{buildroot}%{_datadir}/kyotocabinet
rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a