[libbluray/f17: 7/7] Merge branch 'master' into f17

[Xavier Bachelot]

commit 6cbb6b06eb1fcde8897ff149628d414daa10b625
Merge: 85533fa 401ebd4
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Sep 3 22:57:17 2012 +0200

    Merge branch 'master' into f17

 .gitignore                                 |    1 +
 libbluray-0.2.2-no_doxygen_timestamp.patch |   22 +++++++++++++++++++
 libbluray.spec                             |   32 +++++++++++++++++++++++++--
 sources                                    |    2 +-
 4 files changed, 53 insertions(+), 4 deletions(-)
---
diff --cc libbluray.spec
index e7e297c,48b3e7b..8b97a2a
--- a/libbluray.spec
+++ b/libbluray.spec
@@@ -2,11 -2,12 +2,13 @@@
  %global tarball_date 20111023
  %global git_hash e037110f11e707e223b715f70920913afecfe297
  %global git_short %(echo '%{git_hash}' | cut -c -13)
+ %global build_pdf_doc 0
  
  Name:           libbluray
 +Version:        0.2.2
+ Version:        0.2.3
  %if %{snapshot}
- Release:        0.8.%{tarball_date}git%{git_short}%{?dist}
+ Release:        0.9.%{tarball_date}git%{git_short}%{?dist}
  %else
  Release:        1%{?dist}
  %endif