From fb285002724fbc44aae6d8464d6d355e10228e9fdc0c48fa025af043c20da39f Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Sat, 19 Feb 2011 07:06:10 +0000 Subject: [PATCH] replace make_install with make ... install, and libuuid-devel with e2fsprogs-devel, fixes build on SLE_11, SLE_10 and SLES_9 OBS-URL: https://build.opensuse.org/package/show/server:search/xapian-core?expand=0&rev=25 --- xapian-core.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/xapian-core.spec b/xapian-core.spec index 519b341..f3b2100 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -11,7 +11,11 @@ Url: http://www.xapian.org/ Group: Productivity/Databases/Servers Source: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ +%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1030 BuildRequires: libuuid-devel +%else +BuildRequires: e2fsprogs-devel +%endif BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +39,11 @@ Summary: Files needed for building packages which use Xapian Group: Development/Libraries/C and C++ Requires: libxapian22 = %{version} Requires: gcc-c++ -Requires: libuuid-devel +%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1030 +BuildRequires: libuuid-devel +%else +BuildRequires: e2fsprogs-devel +%endif Requires: zlib-devel %description -n libxapian-devel @@ -51,10 +59,10 @@ files needed for building packages which use Xapian. %build %configure --docdir=%{_docdir}/%{name}/ --disable-static -make %{?smp_mflags} +%__make %{?smp_mflags} %install -%make_install docdatadir=%{_docdir}/%{name} +%__make DESTDIR="%{buildroot}" docdatadir="%{_docdir}/%{name}" install rm -rf examples/{.libs,.deps} rm -rf %{buildroot}%{_docdir}/%{name}/examples/{.dirstamp,*.o}