Author: jajcus Date: Thu May 13 08:08:59 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- without_doc bcond added
- install the built HTML and PDF docs (thes are not the javadoc 'apidocs') when
with_doc
---- Files affected:
packages/java-dbus:
java-dbus.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/java-dbus/java-dbus.spec
diff -u packages/java-dbus/java-dbus.spec:1.11
packages/java-dbus/java-dbus.spec:1.12
--- packages/java-dbus/java-dbus.spec:1.11 Thu May 13 09:38:44 2010
+++ packages/java-dbus/java-dbus.spec Thu May 13 10:08:54 2010
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without doc # do not build full documentation
+#
%include /usr/lib/rpm/macros.java
Summary: Java implementation of D-BUS
Summary(pl.UTF-8): Implementacja D-BUS w Javie
@@ -16,8 +20,10 @@
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
+%if %{with doc}
BuildRequires: texlive-tex4ht
BuildRequires: texlive-xetex
+%endif
Requires: java-libmatthew >= 0.6
Requires: jpackage-utils
Requires: jre >= 1.5
@@ -50,13 +56,15 @@
%setup -q -n dbus-java-%{version}
%build
-%{__make}
+%{__make} bin man doc/api/index.html
+%if %{with doc}
%{__make} doc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install install-man \
+%{__make} install-bin install-man \
DESTDIR=$RPM_BUILD_ROOT \
PREFIX=%{_prefix}
@@ -75,6 +83,10 @@
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING README changelog
+%if %{with doc}
+%doc doc/dbus-java.pdf
+%doc doc/dbus-java
+%endif
%attr(755,root,root) %{_bindir}/CreateInterface
%attr(755,root,root) %{_bindir}/DBusCall
%attr(755,root,root) %{_bindir}/DBusDaemon
@@ -98,6 +110,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2010/05/13 08:08:54 jajcus
+- without_doc bcond added
+- install the built HTML and PDF docs (thes are not the javadoc 'apidocs')
when with_doc
+
Revision 1.11 2010/05/13 07:38:44 jajcus
- BR: texlive-tex4ht, texlive-xetex
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-dbus/java-dbus.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
