[openjpeg/f18: 5/5] Merge branch 'master' into f18

[Rex Dieter]

commit 32a75936d265be883ecd3ed85f48edbc0de28585
Merge: 56223ab 713c641
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 7 08:31:36 2012 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	openjpeg.spec

 .gitignore                                |    1 +
 openjpeg-1.5-r2029.patch                  |   77 ++++++++++++++++++++++++
 openjpeg-1.5-r2031.patch                  |   24 ++++++++
 openjpeg-1.5-r2032.patch                  |   30 ++++++++++
 openjpeg-1.5-r2033.patch                  |   49 +++++++++++++++
 openjpeg-1.5.0-cmake_Config.patch         |   20 ------
 openjpeg-1.5.0-cmake_header_symlink.patch |   14 -----
 openjpeg-1.5.0-cmake_libdir.patch         |   21 -------
 openjpeg-1.5.0-cve-2012-3535.patch        |   17 -----
 openjpeg-1.5.0-pkgconfig_includedir.patch |   24 --------
 openjpeg-1.5.1-cmake_libdir.patch         |   12 ++++
 openjpeg-1.5.1-doxygen_timestamp.patch    |   24 ++++++++
 openjpeg-1.5.1-soname.patch               |   12 ++++
 openjpeg.spec                             |   91 +++++++++++++++++++----------
 sources                                   |    2 +-
 15 files changed, 290 insertions(+), 128 deletions(-)
---