# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1356637915 28800
# Node ID 6fc49b69b1dcc0eb511f88f1660d9294b975692b
# Parent  b08fd8813ffe7df9edd31d3c1f73f16f554fa543
remove unnecessary dependencies

diff -r b08fd8813ffe -r 6fc49b69b1dc libpst.spec.in
--- a/libpst.spec.in	Mon Dec 24 18:49:59 2012 -0800
+++ b/libpst.spec.in	Thu Dec 27 11:51:55 2012 -0800
@@ -1,7 +1,7 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               @PACKAGE@
 Version:            @VERSION@
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
 Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz
@@ -9,7 +9,7 @@
 URL:                http://www.five-ten-sg.com/%{name}/
 Requires:           ImageMagick libgsf
 Requires:           %{name}-libs = %{version}-%{release}
-BuildRequires:      ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel python-devel boost-devel libgsf-devel
+BuildRequires:      ImageMagick gd-devel zlib-devel python-devel boost-devel libgsf-devel
 
 %{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -152,8 +152,12 @@
 
 
 %changelog
+* Wed Dec 26 2012 Carl Byington <carl@five-ten-sg.com> - 0.6.56-2
+- bugzilla 852414, remove unnecessary dependencies
+
 * Mon Dec 24 2012 Carl Byington <carl@five-ten-sg.com> - 0.6.56-1
 - filter private provides from rpm
+- merge -m .msg files code into main branch
 
 * Tue Aug 09 2012 Carl Byington <carl@five-ten-sg.com> - 0.6.55-2
 - rebuild for python
diff -r b08fd8813ffe -r 6fc49b69b1dc regression/regression-tests.bash
--- a/regression/regression-tests.bash	Mon Dec 24 18:49:59 2012 -0800
+++ b/regression/regression-tests.bash	Thu Dec 27 11:51:55 2012 -0800
@@ -65,14 +65,14 @@
             #$val ../src/readpst $jobs -te -r -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## normal recursive dump
-            char='us-ascii'
-            char='BIG-5'
-            echo $val ../src/readpst -C $char -j 0 -r -cv -o output$n -d $ba.log $fn
-                 $val ../src/readpst -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+            #char='us-ascii'
+            #char='BIG-5'
+            #echo $val ../src/readpst -C $char -j 0 -r -cv -o output$n -d $ba.log $fn
+            #     $val ../src/readpst -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
-            ## separate mode with filename extensions
-            #echo $val ../src/readpst $jobs     -r -e -D -cv -o output$n -d $ba.log $fn
-            #     $val ../src/readpst $jobs     -r -e -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+            ## separate mode with filename extensions and .msg files
+            echo $val ../src/readpst $jobs     -r -m -D -cv -o output$n -d $ba.log $fn
+                 $val ../src/readpst $jobs     -r -m -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## separate mode where we decode all attachments to binary files
             #echo $val ../src/readpst $jobs      -r -S -D -cv -o output$n -d $ba.log $fn
diff -r b08fd8813ffe -r 6fc49b69b1dc xml/libpst.in
--- a/xml/libpst.in	Mon Dec 24 18:49:59 2012 -0800
+++ b/xml/libpst.in	Thu Dec 27 11:51:55 2012 -0800
@@ -234,7 +234,7 @@
         <refsect1 id='readpst.quoting.1'>
             <title>From Quoting</title>
             <para>
-                Output formats that place each mail message in a separate file (-M, -S, -e)
+                Output formats that place each mail message in a separate file (-M, -S, -e, -m)
                 don't do any from quoting.
                 Output formats that place multiple email messages in a single file (-k, -r, -u)
                 now use mboxrd from quoting rules.