Author: walluck
Date: Sun Feb 4 04:05:33 2007
New Revision: 116131
Modified:
packages/cooker/gjdoc/current/SPECS/gjdoc.spec
Log:
rebuild without native
use %%bcond_with
Modified: packages/cooker/gjdoc/current/SPECS/gjdoc.spec
==============================================================================
--- packages/cooker/gjdoc/current/SPECS/gjdoc.spec (original)
+++ packages/cooker/gjdoc/current/SPECS/gjdoc.spec Sun Feb 4 04:05:33 2007
@@ -1,14 +1,14 @@
%define gcj_support 1
-%define with_native 1
+%bcond_with native
-%if %{with_native}
+%if %with native
%define gcj_support 0
%endif
Summary: GNU Javadoc
Name: gjdoc
Version: 0.7.7
-Release: %mkrel 12
+Release: %mkrel 13
Epoch: 0
License: GPL
Group: Development/Java
@@ -28,7 +28,7 @@
Requires(postun): java-gcj-compat
BuildRequires: java-gcj-compat-devel
%else
-%if !%{with_native}
+%if %without native
BuildArch: noarch
%endif
%endif
@@ -55,24 +55,26 @@
export JAVAC=%{javac}
export JAVADOC=%{javadoc}
%ifarch noarch
-%configure \
+%{configure} \
%else
-%configure2_5x \
+%{configure2_5x} \
%endif
--with-antlr-jar=%{_javadir}/antlr.jar \
--enable-xmldoclet \
-%if %{with_native}
+%if %with native
--enable-native
%else
--disable-native
%endif
-%make
+%{make}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{makeinstall}
+%if %with natuve
%{_bindir}/chrpath -d %{buildroot}%{_bindir}/gjdoc
+%endif
%{__rm} -rf %{buildroot}%{_datadir}/info/dir
@@ -93,7 +95,7 @@
%if %{gcj_support}
%post
-%{update_gcj_db}
+%{update_gcjdb}
%endif
%if 0
@@ -102,7 +104,7 @@
%if %{gcj_support}
%postun
-%{clean_gcj_db}
+%{clean_gcjdb}
%endif
%if 0
@@ -125,7 +127,7 @@
%{_libdir}/gcj/%{name}/com-sun-tools-doclets-Taglet-%{version}.jar.*
%{_libdir}/gcj/%{name}/gnu-classpath-tools-gjdoc-%{version}.jar.*
%endif
-%if %{with_native}
+%if %with native
#%{_libdir}/lib-com-sun-javadoc.la
%{_libdir}/lib-com-sun-javadoc.so
%{_libdir}/lib-com-sun-javadoc.so.0