Author: steletch
Date: Mon Feb 5 22:57:44 2007
New Revision: 116503
Modified:
packages/cooker/bibus/current/SPECS/bibus.spec
Log:
fix configuration for x86_64 case
provide backport compatibility for 2007.0
Modified: packages/cooker/bibus/current/SPECS/bibus.spec
==============================================================================
--- packages/cooker/bibus/current/SPECS/bibus.spec (original)
+++ packages/cooker/bibus/current/SPECS/bibus.spec Mon Feb 5 22:57:44 2007
@@ -1,7 +1,7 @@
%define name bibus
%define version 1.2.0
%define bibusrel 1
-%define release %mkrel 4
+%define release %mkrel 5
Summary: Bibliographic database manager with OpenOffice.org integration
Name: %{name}
@@ -51,12 +51,35 @@
%install
rm -rf $RPM_BUILD_ROOT
+
+%if %{mdkversion} < 200710
+# Before 2007.1 there was no x86_64 OpenOffice.org build
%make -f Setup/Makefile \
DESTDIR=$RPM_BUILD_ROOT%{_prefix} \
sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
python=%{_bindir}/python \
oopath=%{_libdir}/ooo-2.0/program \
install
+%else
+ %ifarch x86_64
+ %make -f Setup/Makefile \
+ DESTDIR=$RPM_BUILD_ROOT%{_prefix} \
+ sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
+ python=%{_bindir}/python \
+ oopath=%{_libdir}/ooo-2.0_64/program \
+ install
+ %endif
+
+ %ifarch i586
+ %make -f Setup/Makefile \
+ DESTDIR=$RPM_BUILD_ROOT%{_prefix} \
+ sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
+ python=%{_bindir}/python \
+ oopath=%{_libdir}/ooo-2.0/program \
+ install
+ %endif
+%endif
+
# we use our own doc installation macro
rm -rf $RPM_BUILD_ROOT%{_docdir}/bibus
# rpm deals with uninstallation
