Author: glen Date: Thu Sep 25 11:32:36 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - adapter, rm apidocs if built without
---- Files affected: SPECS: poppler.spec (1.67 -> 1.68) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.67 SPECS/poppler.spec:1.68 --- SPECS/poppler.spec:1.67 Tue Sep 2 00:54:22 2008 +++ SPECS/poppler.spec Thu Sep 25 13:32:31 2008 @@ -19,9 +19,8 @@ # Source0-md5: 9af81429d6f8639c357a5eed25583365 URL: http://poppler.freedesktop.org/ %{?with_qt4:BuildRequires: QtGui-devel >= 4.1.0} -%{?with_qt4:BuildRequires: QtXml-devel >= 4.1.0} %{?with_qt4:BuildRequires: QtTest-devel >= 4.1.0} -%{?with_qt4:BuildRequires: qt4-build} +%{?with_qt4:BuildRequires: QtXml-devel >= 4.1.0} BuildRequires: autoconf >= 2.59 BuildRequires: automake %{?with_cairo:BuildRequires: cairo-devel >= %{cairo_ver}} @@ -31,10 +30,11 @@ %{?with_apidocs:BuildRequires: gtk-doc >= 1.0} BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel -BuildRequires: libxml2-devel >= 2.0 BuildRequires: libtool >= 2:1.5 +BuildRequires: libxml2-devel >= 2.0 BuildRequires: pkgconfig %{?with_qt:BuildRequires: qt-devel >= 3.0} +%{?with_qt4:BuildRequires: qt4-build} BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -180,8 +180,8 @@ Summary: Header files for Qt4 wrapper for poppler Summary(pl.UTF-8): Pliki nagłówkowe wrappera Qt4 dla popplera Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-Qt = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: QtGui-devel Requires: QtXml-devel @@ -210,8 +210,8 @@ Provides: pdftops Obsoletes: pdftohtml Obsoletes: pdftohtml-pdftops -Obsoletes: xpdf-tools Obsoletes: poppler-utils +Obsoletes: xpdf-tools %description progs Package contains utilites for PDF files. These utilities allow to @@ -247,6 +247,7 @@ --enable-xpdf-headers \ --enable-zlib \ --with-html-dir=%{_gtkdocdir} + %{__make} %install @@ -255,6 +256,11 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%if %{without apidocs} +# why it still installs them, brr +rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -364,6 +370,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.68 2008/09/25 11:32:31 glen +- adapter, rm apidocs if built without + Revision 1.67 2008/09/01 22:54:22 adamg - updated to 0.8.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poppler.spec?r1=1.67&r2=1.68&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
