# HG changeset patch # User Carl Byington # Date 1500692086 25200 # Node ID 5b52efe35bd878fe76f1a4dc0fd7a251cf1c3629 # Parent c023398790416b7603cbab434ca10f65ea59e029 fedora python nameing scheme changes diff -r c02339879041 -r 5b52efe35bd8 configure.in --- a/configure.in Wed Feb 08 21:06:17 2017 -0800 +++ b/configure.in Fri Jul 21 19:54:46 2017 -0700 @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(libpst,0.6.70,carl@five-ten-sg.com) +AC_INIT(libpst,0.6.71,carl@five-ten-sg.com) AC_CONFIG_SRCDIR([src/libpst.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff -r c02339879041 -r 5b52efe35bd8 libpst.spec.in --- a/libpst.spec.in Wed Feb 08 21:06:17 2017 -0800 +++ b/libpst.spec.in Fri Jul 21 19:54:46 2017 -0700 @@ -10,7 +10,12 @@ Requires: ImageMagick libgsf Requires: %{name}-libs = %{version}-%{release} BuildRequires: libtool -BuildRequires: ImageMagick gd-devel zlib-devel python-devel boost-devel libgsf-devel +BuildRequires: ImageMagick gd-devel zlib-devel boost-devel libgsf-devel +%if 0%{?fedora} > 25 +BuildRequires: python2-devel +%else +BuildRequires: python-devel +%endif %{!?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)")} @@ -33,10 +38,15 @@ utilities. +%if 0%{?fedora} > 25 +%package python2 +Requires: python2 +%else %package python +Requires: python +%endif Summary: Python bindings for libpst Group: Development/Libraries -Requires: python Requires: %{name}-libs = %{version}-%{release} %if 0%{?fedora} >= 20 @@ -49,7 +59,11 @@ %endif +%if 0%{?fedora} > 25 %description python +%else +%description python2 +%endif The libpst-python package allows you to use the libpst shared object from python code. @@ -129,11 +143,19 @@ %doc COPYING +%if 0%{?fedora} > 25 +%files python2 +%defattr(-,root,root,-) +%{python2_sitearch}/_*.so +%exclude %{python2_sitearch}/*.a +%exclude %{python2_sitearch}/*.la +%else %files python %defattr(-,root,root,-) %{python_sitearch}/_*.so %exclude %{python_sitearch}/*.a %exclude %{python_sitearch}/*.la +%endif %files devel @@ -160,6 +182,15 @@ %changelog +* Wed Feb 08 2017 Carl Byington 0.6.71-1 +- fedora python naming scheme changes + +* Thu Jul 20 2017 Kalev Lember - 0.6.70-3 +- Rebuilt for Boost 1.64 + +* Fri Jul 07 2017 Igor Gnatenko - 0.6.70-2 +- Rebuild due to bug in RPM (RHBZ #1468476) + * Wed Feb 08 2017 Carl Byington 0.6.70-1 - Jeffrey Morlan - pst_getID2 must not recurse into children diff -r c02339879041 -r 5b52efe35bd8 regression/regression-tests.bash --- a/regression/regression-tests.bash Wed Feb 08 21:06:17 2017 -0800 +++ b/regression/regression-tests.bash Fri Jul 21 19:54:46 2017 -0700 @@ -81,16 +81,16 @@ # $val ../src/readpst $utf $acc -C $char -j 0 -k -cv -o output$n -d $ba.log $fn >$ba.err 2>&1 ## recursive mode - echo $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn - $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn >$ba.err 2>&1 + #echo $val ../src/readpst $utf $acc -C $char -j 0 -r -cv -o output$n -d $ba.log $fn + # $val ../src/readpst $utf $acc -C $char -j 0 -r -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 - # $val ../src/readpst $jobs -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1 + echo $val ../src/readpst $jobs -r -S -D -cv -o output$n -d $ba.log $fn + $val ../src/readpst $jobs -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1 ## testing idblock #../src/getidblock -p $fn 0 >$ba.fulldump @@ -122,37 +122,37 @@ [ "$2" == "reg" ] && regression="yes" [ "$regression" == "yes" ] && val="" -$func 1 ams.pst -$func 2 sample_64.pst -$func 3 test.pst -$func 4 big_mail.pst -$func 5 mbmg.archive.pst -$func 6 Single2003-read.pst -$func 7 Single2003-unread.pst -$func 8 ol2k3high.pst -$func 9 ol97high.pst -$func 10 returned_message.pst -$func 11 flow.pst -$func 12 test-html.pst -$func 13 test-text.pst -$func 14 joe.romanowski.pst -$func 15 hourig1.pst -$func 16 test-mac.pst -$func 17 backup.pst -$func 18 spam.pst -$func 19 rendgen.pst # single email appointment -$func 20 rendgen2.pst # email appointment with no termination date -$func 21 rendgen3.pst # mime signed email -$func 22 rendgen4.pst # appointment test cases -$func 23 rendgen5.pst # appointment test cases -$func 24 paul.sheer.pst # embedded rfc822 attachment -$func 25 jerry.pst # non ascii subject lines -$func 26 phill.bertolus.pst # possible segfault in forked process, cannot reproduce -$func 27 kaiser.pst # appointments with other character sets -$func 28 pstsample.pst # character set issue -$func 29 pstsample2.pst # embedded image in rtf data -$func 30 pstsample3.pst # exports of rtf and html -$func 31 Journal_Archives_08_29_2010.pst +# $func 1 ams.pst +# $func 2 sample_64.pst +# $func 3 test.pst +# $func 4 big_mail.pst +# $func 5 mbmg.archive.pst +# $func 6 Single2003-read.pst +# $func 7 Single2003-unread.pst +# $func 8 ol2k3high.pst +# $func 9 ol97high.pst +# $func 10 returned_message.pst +# $func 11 flow.pst +# $func 12 test-html.pst +# $func 13 test-text.pst +# $func 14 joe.romanowski.pst +# $func 15 hourig1.pst +# $func 16 test-mac.pst +# $func 17 backup.pst +# $func 18 spam.pst +# $func 19 rendgen.pst # single email appointment +# $func 20 rendgen2.pst # email appointment with no termination date +# $func 21 rendgen3.pst # mime signed email + $func 22 rendgen4.pst # appointment test cases +# $func 23 rendgen5.pst # appointment test cases +# $func 24 paul.sheer.pst # embedded rfc822 attachment +# $func 25 jerry.pst # non ascii subject lines +# $func 26 phill.bertolus.pst # possible segfault in forked process, cannot reproduce +# $func 27 kaiser.pst # appointments with other character sets +# $func 28 pstsample.pst # character set issue +# $func 29 pstsample2.pst # embedded image in rtf data +# $func 30 pstsample3.pst # exports of rtf and html +# $func 31 Journal_Archives_08_29_2010.pst [ -n "$val" ] && grep 'lost:' *err | grep -v 'lost: 0 '