libpst

changeset 372:5b52efe35bd8

fedora python nameing scheme changes
author Carl Byington <carl@five-ten-sg.com>
date Fri, 21 Jul 2017 19:54:46 -0700
parents c02339879041
children 0ccc746c8079
files configure.in libpst.spec.in regression/regression-tests.bash
diffstat 3 files changed, 69 insertions(+), 38 deletions(-) [+]
line diff
     1.1 --- a/configure.in	Wed Feb 08 21:06:17 2017 -0800
     1.2 +++ b/configure.in	Fri Jul 21 19:54:46 2017 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  AC_PREREQ(2.60)
     1.5 -AC_INIT(libpst,0.6.70,carl@five-ten-sg.com)
     1.6 +AC_INIT(libpst,0.6.71,carl@five-ten-sg.com)
     1.7  AC_CONFIG_SRCDIR([src/libpst.c])
     1.8  AC_CONFIG_HEADER([config.h])
     1.9  AC_CONFIG_MACRO_DIR([m4])
     2.1 --- a/libpst.spec.in	Wed Feb 08 21:06:17 2017 -0800
     2.2 +++ b/libpst.spec.in	Fri Jul 21 19:54:46 2017 -0700
     2.3 @@ -10,7 +10,12 @@
     2.4  Requires:           ImageMagick libgsf
     2.5  Requires:           %{name}-libs = %{version}-%{release}
     2.6  BuildRequires:      libtool
     2.7 -BuildRequires:      ImageMagick gd-devel zlib-devel python-devel boost-devel libgsf-devel
     2.8 +BuildRequires:      ImageMagick gd-devel zlib-devel boost-devel libgsf-devel
     2.9 +%if 0%{?fedora} > 25
    2.10 +BuildRequires:      python2-devel
    2.11 +%else
    2.12 +BuildRequires:      python-devel
    2.13 +%endif
    2.14  
    2.15  %{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
    2.16  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
    2.17 @@ -33,10 +38,15 @@
    2.18  utilities.
    2.19  
    2.20  
    2.21 +%if 0%{?fedora} > 25
    2.22 +%package python2
    2.23 +Requires:           python2
    2.24 +%else
    2.25  %package python
    2.26 +Requires:           python
    2.27 +%endif
    2.28  Summary:            Python bindings for libpst
    2.29  Group:              Development/Libraries
    2.30 -Requires:           python
    2.31  Requires:           %{name}-libs = %{version}-%{release}
    2.32  
    2.33  %if 0%{?fedora} >= 20
    2.34 @@ -49,7 +59,11 @@
    2.35  %endif
    2.36  
    2.37  
    2.38 +%if 0%{?fedora} > 25
    2.39  %description python
    2.40 +%else
    2.41 +%description python2
    2.42 +%endif
    2.43  The libpst-python package allows you to use the libpst shared object
    2.44  from python code.
    2.45  
    2.46 @@ -129,11 +143,19 @@
    2.47  %doc COPYING
    2.48  
    2.49  
    2.50 +%if 0%{?fedora} > 25
    2.51 +%files python2
    2.52 +%defattr(-,root,root,-)
    2.53 +%{python2_sitearch}/_*.so
    2.54 +%exclude %{python2_sitearch}/*.a
    2.55 +%exclude %{python2_sitearch}/*.la
    2.56 +%else
    2.57  %files python
    2.58  %defattr(-,root,root,-)
    2.59  %{python_sitearch}/_*.so
    2.60  %exclude %{python_sitearch}/*.a
    2.61  %exclude %{python_sitearch}/*.la
    2.62 +%endif
    2.63  
    2.64  
    2.65  %files devel
    2.66 @@ -160,6 +182,15 @@
    2.67  
    2.68  
    2.69  %changelog
    2.70 +* Wed Feb 08 2017 Carl Byington <carl@five-ten-sg.com> 0.6.71-1
    2.71 +- fedora python naming scheme changes
    2.72 +
    2.73 +* Thu Jul 20 2017 Kalev Lember <klember@redhat.com> - 0.6.70-3
    2.74 +- Rebuilt for Boost 1.64
    2.75 +
    2.76 +* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.6.70-2
    2.77 +- Rebuild due to bug in RPM (RHBZ #1468476)
    2.78 +
    2.79  * Wed Feb 08 2017 Carl Byington <carl@five-ten-sg.com> 0.6.70-1
    2.80  - Jeffrey Morlan - pst_getID2 must not recurse into children
    2.81  
     3.1 --- a/regression/regression-tests.bash	Wed Feb 08 21:06:17 2017 -0800
     3.2 +++ b/regression/regression-tests.bash	Fri Jul 21 19:54:46 2017 -0700
     3.3 @@ -81,16 +81,16 @@
     3.4              #     $val ../src/readpst $utf $acc -C $char -j 0 -k -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
     3.5  
     3.6              ## recursive mode
     3.7 -            echo $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn
     3.8 -                 $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
     3.9 +            #echo $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn
    3.10 +            #     $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
    3.11  
    3.12              ## separate mode with filename extensions and .msg files
    3.13              #echo $val ../src/readpst $jobs     -r -m -D -cv -o output$n -d $ba.log $fn
    3.14              #     $val ../src/readpst $jobs     -r -m -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
    3.15  
    3.16              ## separate mode where we decode all attachments to binary files
    3.17 -            #echo $val ../src/readpst $jobs      -r -S -D -cv -o output$n -d $ba.log $fn
    3.18 -            #     $val ../src/readpst $jobs      -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
    3.19 +            echo $val ../src/readpst $jobs     -r -S -D -cv -o output$n -d $ba.log $fn
    3.20 +                 $val ../src/readpst $jobs     -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
    3.21  
    3.22              ## testing idblock
    3.23              #../src/getidblock -p $fn 0 >$ba.fulldump
    3.24 @@ -122,37 +122,37 @@
    3.25  [ "$2" == "reg" ] && regression="yes"
    3.26  [ "$regression" == "yes" ] && val=""
    3.27  
    3.28 -$func   1 ams.pst
    3.29 -$func   2 sample_64.pst
    3.30 -$func   3 test.pst
    3.31 -$func   4 big_mail.pst
    3.32 -$func   5 mbmg.archive.pst
    3.33 -$func   6 Single2003-read.pst
    3.34 -$func   7 Single2003-unread.pst
    3.35 -$func   8 ol2k3high.pst
    3.36 -$func   9 ol97high.pst
    3.37 -$func  10 returned_message.pst
    3.38 -$func  11 flow.pst
    3.39 -$func  12 test-html.pst
    3.40 -$func  13 test-text.pst
    3.41 -$func  14 joe.romanowski.pst
    3.42 -$func  15 hourig1.pst
    3.43 -$func  16 test-mac.pst
    3.44 -$func  17 backup.pst
    3.45 -$func  18 spam.pst
    3.46 -$func  19 rendgen.pst           # single email appointment
    3.47 -$func  20 rendgen2.pst          # email appointment with no termination date
    3.48 -$func  21 rendgen3.pst          # mime signed email
    3.49 -$func  22 rendgen4.pst          # appointment test cases
    3.50 -$func  23 rendgen5.pst          # appointment test cases
    3.51 -$func  24 paul.sheer.pst        # embedded rfc822 attachment
    3.52 -$func  25 jerry.pst             # non ascii subject lines
    3.53 -$func  26 phill.bertolus.pst    # possible segfault in forked process, cannot reproduce
    3.54 -$func  27 kaiser.pst            # appointments with other character sets
    3.55 -$func  28 pstsample.pst         # character set issue
    3.56 -$func  29 pstsample2.pst        # embedded image in rtf data
    3.57 -$func  30 pstsample3.pst        # exports of rtf and html
    3.58 -$func  31 Journal_Archives_08_29_2010.pst
    3.59 +# $func   1 ams.pst
    3.60 +# $func   2 sample_64.pst
    3.61 +# $func   3 test.pst
    3.62 +# $func   4 big_mail.pst
    3.63 +# $func   5 mbmg.archive.pst
    3.64 +# $func   6 Single2003-read.pst
    3.65 +# $func   7 Single2003-unread.pst
    3.66 +# $func   8 ol2k3high.pst
    3.67 +# $func   9 ol97high.pst
    3.68 +# $func  10 returned_message.pst
    3.69 +# $func  11 flow.pst
    3.70 +# $func  12 test-html.pst
    3.71 +# $func  13 test-text.pst
    3.72 +# $func  14 joe.romanowski.pst
    3.73 +# $func  15 hourig1.pst
    3.74 +# $func  16 test-mac.pst
    3.75 +# $func  17 backup.pst
    3.76 +# $func  18 spam.pst
    3.77 +# $func  19 rendgen.pst           # single email appointment
    3.78 +# $func  20 rendgen2.pst          # email appointment with no termination date
    3.79 +# $func  21 rendgen3.pst          # mime signed email
    3.80 +  $func  22 rendgen4.pst          # appointment test cases
    3.81 +# $func  23 rendgen5.pst          # appointment test cases
    3.82 +# $func  24 paul.sheer.pst        # embedded rfc822 attachment
    3.83 +# $func  25 jerry.pst             # non ascii subject lines
    3.84 +# $func  26 phill.bertolus.pst    # possible segfault in forked process, cannot reproduce
    3.85 +# $func  27 kaiser.pst            # appointments with other character sets
    3.86 +# $func  28 pstsample.pst         # character set issue
    3.87 +# $func  29 pstsample2.pst        # embedded image in rtf data
    3.88 +# $func  30 pstsample3.pst        # exports of rtf and html
    3.89 +# $func  31 Journal_Archives_08_29_2010.pst
    3.90  
    3.91  [ -n "$val" ] && grep 'lost:' *err | grep -v 'lost: 0 '
    3.92