Author: arekm Date: Tue Jul 29 17:49:19 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- restore apidocs
---- Files affected:
SPECS:
rpm.spec (1.900 -> 1.901)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.900 SPECS/rpm.spec:1.901
--- SPECS/rpm.spec:1.900 Tue Jul 29 19:36:01 2008
+++ SPECS/rpm.spec Tue Jul 29 19:49:13 2008
@@ -27,6 +27,7 @@
#
# Conditional build:
%bcond_with static # build static rpm+rpmi
+%bcond_without apidocs # don't generate documentation with doxygen
%bcond_with autoreqdep # autogenerate package name deps in addition to
sonames/perl(X)
%bcond_without python # don't build python bindings
%bcond_without selinux # build without selinux support
@@ -172,6 +173,12 @@
%{?with_python:BuildRequires: rpm-pythonprov}
%{?with_sqlite:BuildRequires: sqlite3-devel}
BuildRequires: zlib-devel
+%if %{with apidocs}
+BuildRequires: doxygen
+BuildRequires: ghostscript
+BuildRequires: graphviz
+BuildRequires: tetex-pdftex
+%endif
%if %{with static}
# Require static library only for static build
BuildRequires: beecrypt-static >= %{beecrypt_ver}
@@ -296,7 +303,6 @@
%{?with_selinux:Requires: libselinux >= 1.18}
Requires: popt >= %{reqpopt_ver}
%{?with_suggest_tags:Suggests: lzma}
-Obsoletes: rpm-apidocs
Obsoletes: rpm-libs
# avoid SEGV caused by mixed db versions
Conflicts: poldek < 0.18.1-16
@@ -634,6 +640,19 @@
Esse pacote deve ser instalado se você quiser desenvolver programas em
Python para manipular pacotes e bancos de dados RPM.
+%package apidocs
+Summary: RPM API documentation and guides
+Summary(pl.UTF-8): Documentacja API RPM-a i przewodniki
+Group: Documentation
+
+%description apidocs
+Documentation for RPM API and guides in HTML format generated from rpm
+sources by doxygen.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
+źrodeł RPM-a przez doxygen.
+
%prep
%setup -q -n %{name}-%{version}%{?subver}
%patch0 -p1
@@ -723,6 +742,7 @@
%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies}
\
--enable-shared \
--enable-static \
+ %{!?with_apidocs:--without-apidocs} \
%{?with_python:--with-python=%{py_ver}
--with-python-lib-dir=%{py_sitedir}} \
%{!?with_python:--without-python} \
--with%{!?with_selinux:out}-selinux \
@@ -748,6 +768,8 @@
CXX="%{__cxx}" \
CPP="%{__cpp}"
+%{?with_apidocs:%{__make} apidocs}
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg}
@@ -1297,12 +1319,21 @@
%{py_sitedir}/rpm/*.py[co]
%endif
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc apidocs
+%endif
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.901 2008/07/29 17:49:13 arekm
+- restore apidocs
+
Revision 1.900 2008/07/29 17:36:01 arekm
- merge misc from rpm-4_4_9 branch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.900&r2=1.901&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
