[mate-keyring/f18: 4/4] Merge branch 'master' into f18

[Dan Mashal]

commit 7e27903c080e3591d065a7560bd59801b36e54fd
Merge: 966865c 658618f
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu May 23 20:17:33 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-keyring.spec

 .gitignore        |    1 +
 mate-keyring.spec |   30 +++++++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)
---
diff --cc mate-keyring.spec
index c97071e,f52a19a..d8ca1b0
--- a/mate-keyring.spec
+++ b/mate-keyring.spec
@@@ -105,17 -104,24 +104,34 @@@ f
  %{_includedir}/mategcr/
  %{_includedir}/mate-gck/
  %{_includedir}/gck/
- %{_libdir}/lib*.so
- %{_libdir}/pkgconfig/*
+ %{_libdir}/libmategck.so
+ %{_libdir}/libmategcr.so
+ %{_libdir}/pkgconfig/mate-gck-0.pc
+ %{_libdir}/pkgconfig/mate-gcr-0.pc
  
  %changelog
++<<<<<<< HEAD
 +* Sat Apr 13 2013 Rex Dieter <rdieter at fedoraproject.org> - 1.5.1-2
 +- %%build: revert back to --with-pam-dir=/%%{_lib}/security/ (#951456)
 +- %%build: drop --enable-gcov (developer-only option, not needed here)
 +- drop unused patches
 +- -pam: drop extra %%doc stuff (included already in Required base pkg)
 +- use %%caps(cap_ipc_lock=ep) .../mate-keyring-daemon (see also #668831)
 +
++=======
+ * Fri Apr 12 2013 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-2
+ - %%build: revert back to --with-pam-dir=/%%{_lib}/security/ (#951456)
+ - %%build: drop --enable-gcov (developer-only option, not needed here)
+ - %%files: track abi (lib sonames) closer
+ - drop unused patches
+ - -pam: drop extra %%doc stuff (included already in Required base pkg)
+ - -devel: drop explicit Requires: libmatekeyring-devel
+ - use %%caps(cap_ipc_lock=ep) .../mate-keyring-daemon (see also #668831)
+ 
+ * Wed Apr 03 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.0-1
+ - Update to latest 1.6.0 stable release
+ 
++>>>>>>> master
  * Mon Mar 25 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-1
  - Update to latest upstream release
  - Disable valgrind