[Erp5-report] r17748 - in /spec/mandriva/2008.0: erp5-ERP5/ erp5-ERP5Form/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 22 15:36:53 2007
New Revision: 17748

URL: http://svn.erp5.org?rev=17748&view=rev
Log:
- Require poppler instead of xpdf-tools

Modified:
    spec/mandriva/2008.0/erp5-ERP5/erp5-ERP5.spec
    spec/mandriva/2008.0/erp5-ERP5Form/erp5-ERP5Form.spec

Modified: spec/mandriva/2008.0/erp5-ERP5/erp5-ERP5.spec
URL: http://svn.erp5.org/spec/mandriva/2008.0/erp5-ERP5/erp5-ERP5.spec?rev=17748&r1=17747&r2=17748&view=diff
==============================================================================
--- spec/mandriva/2008.0/erp5-ERP5/erp5-ERP5.spec (original)
+++ spec/mandriva/2008.0/erp5-ERP5/erp5-ERP5.spec Thu Nov 22 15:36:53 2007
@@ -1,6 +1,6 @@
 %define product ERP5
 %define version 0.14
-%define release 14
+%define release 15
 
 %define rpm_prefix erp5
 %define zope_home     %{_prefix}/lib/erp5
@@ -17,8 +17,8 @@
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
-# xpdf-tools and ImageMagick are required by the erp5_pdf_editor Business Template
-Requires:  %{rpm_prefix}-zope < 2.9.0, %{rpm_prefix}-Formulator, %{rpm_prefix}-CMFReportTool, %{rpm_prefix}-Localizer, %{rpm_prefix}-ZMySQLDDA, %{rpm_prefix}-ZMySQLDA, %{rpm_prefix}-BTreeFolder2, %{rpm_prefix}-CMFMailIn, %{rpm_prefix}-ERP5Catalog, %{rpm_prefix}-ERP5Form, %{rpm_prefix}-ERP5SyncML, %{rpm_prefix}-CMFCategory, %{rpm_prefix}-ERP5Type, python2.4-numeric, python2.4-glpk, %{rpm_prefix}-CMFActivity, %{rpm_prefix}-ERP5Security, %{rpm_prefix}-ERP5OOo, %{rpm_prefix}-ExtFile, %{rpm_prefix}-TimerService, %{rpm_prefix}-FCKeditor, %{rpm_prefix}-MimetypesRegistry, %{rpm_prefix}-PortalTransforms, xpdf-tools, ImageMagick, pdftohtml
+# poppler and ImageMagick are required by the erp5_pdf_editor Business Template
+Requires:  %{rpm_prefix}-zope < 2.9.0, %{rpm_prefix}-Formulator, %{rpm_prefix}-CMFReportTool, %{rpm_prefix}-Localizer, %{rpm_prefix}-ZMySQLDDA, %{rpm_prefix}-ZMySQLDA, %{rpm_prefix}-BTreeFolder2, %{rpm_prefix}-CMFMailIn, %{rpm_prefix}-ERP5Catalog, %{rpm_prefix}-ERP5Form, %{rpm_prefix}-ERP5SyncML, %{rpm_prefix}-CMFCategory, %{rpm_prefix}-ERP5Type, python2.4-numeric, python2.4-glpk, %{rpm_prefix}-CMFActivity, %{rpm_prefix}-ERP5Security, %{rpm_prefix}-ERP5OOo, %{rpm_prefix}-ExtFile, %{rpm_prefix}-TimerService, %{rpm_prefix}-FCKeditor, %{rpm_prefix}-MimetypesRegistry, %{rpm_prefix}-PortalTransforms, poppler, ImageMagick, pdftohtml
 %ifarch %{ix86}
 Requires: python2.4-psyco
 %endif
@@ -80,6 +80,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Nov 22 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.14-15mdv2008.0
+- Require poppler instead of xpdf-tools
+
 * Tue Oct  9 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.14-14mdv2007.1
 - add dependencies of erp5-MimetypesRegistry and erp5-PortalTransforms
 

Modified: spec/mandriva/2008.0/erp5-ERP5Form/erp5-ERP5Form.spec
URL: http://svn.erp5.org/spec/mandriva/2008.0/erp5-ERP5Form/erp5-ERP5Form.spec?rev=17748&r1=17747&r2=17748&view=diff
==============================================================================
--- spec/mandriva/2008.0/erp5-ERP5Form/erp5-ERP5Form.spec (original)
+++ spec/mandriva/2008.0/erp5-ERP5Form/erp5-ERP5Form.spec Thu Nov 22 15:36:53 2007
@@ -1,6 +1,6 @@
 %define product ERP5Form
 %define version 0.14
-%define release 5
+%define release 6
 
 %define rpm_prefix erp5
 %define zope_home     %{_prefix}/lib/erp5
@@ -18,7 +18,7 @@
 BuildArch: noarch
 Conflicts: ERP5Form
 Requires:  %{rpm_prefix}-zope %{rpm_prefix}-Formulator pdftk python2.4-pychart
-Requires:  xpdf-tools
+Requires:  ImageMagick, poppler
 
 #----------------------------------------------------------------------
 %description
@@ -60,6 +60,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Nov 22 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.14-6mdv2008.0
+- Require poppler instead of xpdf-tools
+
 * Wed Aug  8 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.14-5mdv2007.1
 - add *.pyc