From c41a7a2096f689568f1f42eafe71a83240de8124 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 8 May 2008 10:52:08 +0000 Subject: [PATCH] merged changeset 9273 in the onelab branch --- PLCAPI.spec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/PLCAPI.spec b/PLCAPI.spec index 36f9f6e..4b4a7ab 100644 --- a/PLCAPI.spec +++ b/PLCAPI.spec @@ -41,11 +41,6 @@ BuildRequires: php-devel Obsoletes: php-xmlrpc Provides: php-xmlrpc -# OpenJade does not honor XML catalog files and tries to access -# www.oasis-open.org even if DTDs are locally installed. Disable -# documentation generation for now. -# BuildRequires: docbook-dtds, docbook-utils-pdf - # PostgreSQL and SOAPpy are necessary to run the API server, but not # plcsh. Since the only supported method of running the server is via # MyPLC anyway, don't be so stringent about binary requirements, in @@ -72,11 +67,6 @@ else fi # Build __init__.py metafiles and PHP API. %{__make} %{?_smp_mflags} subdirs="php php/xmlrpc" modules="$modules" -# Build documentation -# beware that making the pdf file somehow overwrites the html -%{__make} -C doc PLCAPI.pdf -rm -f doc/PLCAPI.html -%{__make} -C doc PLCAPI.html %install rm -rf $RPM_BUILD_ROOT @@ -86,10 +76,6 @@ else modules="" fi %{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT" datadir="%{_datadir}" bindir="%{_bindir}" modules="$modules" -#someone out there skips doc installation - we DO want this installed -for doc in PLCAPI.html PLCAPI.pdf ; do - install -D -m 644 doc/$doc $RPM_BUILD_ROOT/"%{_datadir}"/plc_api/doc/$doc -done # Install shell symlink mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -108,8 +94,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -#someone out there skips doc installation - we DO want this installed -#%doc doc/PLCAPI.xml doc/PLCAPI.pdf doc/PLCAPI.html %dir %{_datadir}/plc_api %{_datadir}/plc_api/* %{_bindir}/plcsh -- 2.43.0