[gnome-keyring-sharp] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org

[Christian Krause]

commit e45478c43c0f7c9e649d0ac29a3a3a6db7122ae5
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 31 17:21:15 2011 +0100

    Change paths for mono assemblies according to updated packaging
    guidelines (http://fedoraproject.org/wiki/Packaging:Mono)

 gnome-keyring-sharp-1.0.1-monodoc-dir.patch |   10 +++++++++
 gnome-keyring-sharp-libdir.patch            |   30 ---------------------------
 gnome-keyring-sharp.spec                    |   17 +++++++++------
 3 files changed, 20 insertions(+), 37 deletions(-)
---
diff --git a/gnome-keyring-sharp-1.0.1-monodoc-dir.patch b/gnome-keyring-sharp-1.0.1-monodoc-dir.patch
new file mode 100644
index 0000000..71945c2
--- /dev/null
+++ b/gnome-keyring-sharp-1.0.1-monodoc-dir.patch
@@ -0,0 +1,10 @@
+diff -uNr gnome-keyring-sharp-1.0.1.old/docs/Makefile.am gnome-keyring-sharp-1.0.1/docs/Makefile.am
+--- gnome-keyring-sharp-1.0.1.old/docs/Makefile.am	2009-05-07 17:32:19.000000000 +0200
++++ gnome-keyring-sharp-1.0.1/docs/Makefile.am	2011-10-31 17:03:46.648191581 +0100
+@@ -1,5 +1,5 @@
+ if ENABLE_MONODOC
+-SOURCESDIR=$(libdir)/monodoc/sources
++SOURCESDIR=$(prefix)/lib/monodoc/sources
+ TARGETS=Gnome.Keyring.tree Gnome.Keyring.zip Gnome.Keyring.source
+ UPDATER = $(MONODOCER) -path:Gnome.Keyring $(UPDATE_ASSEMBLIES)
+ else
diff --git a/gnome-keyring-sharp.spec b/gnome-keyring-sharp.spec
index 04337fe..312943a 100644
--- a/gnome-keyring-sharp.spec
+++ b/gnome-keyring-sharp.spec
@@ -3,7 +3,7 @@
 
 Name:           gnome-keyring-sharp
 Version:        1.0.1
-Release:        0.8.%{svn_rev}svn%{?dist}
+Release:        0.9.%{svn_rev}svn%{?dist}
 Summary:        Mono implementation of GNOME Keyring
 
 Group:          System Environment/Libraries
@@ -16,11 +16,11 @@ URL:            http://www.mono-project.com/Libraries#Gnome-KeyRing-Sharp
 # tar cjf gnome-keyring-sharp-%{version}-r%{svn_rev}.tar.bz2 --exclude=.svn \
 #   gnome-keyring-sharp-%{version}
 Source0:        gnome-keyring-sharp-%{version}-r%{svn_rev}.tar.bz2
-Patch0:         gnome-keyring-sharp-libdir.patch
 # Patch to directly p/invoke libgnome-keyring instead of using
 # deprecated socket interface taken from upstream bug report:
 # https://bugzilla.novell.com/show_bug.cgi?id=589166
 Patch1:         gnome-keyring-sharp-1.0.1-new-api.diff
+Patch2:         gnome-keyring-sharp-1.0.1-monodoc-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Mono only available on these:
@@ -61,8 +61,8 @@ for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
 %patch1 -p0 -F 2 -b .new-api
+%patch2 -p1 -b .monodoc-dir
 
 
 %build
@@ -87,21 +87,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%{_libdir}/mono/gnome-keyring-sharp-1.0
-%{_libdir}/mono/gac/Gnome.Keyring
+%{_prefix}/lib/mono/gnome-keyring-sharp-1.0
+%{_prefix}/lib/mono/gac/Gnome.Keyring
 %{_libdir}/libgnome-keyring-sharp-glue.so
 
 %files devel
 %defattr(-,root,root,-)
-#doc 
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 
 %files doc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc/sources/Gnome.Keyring.*
+%{_prefix}/lib/monodoc/sources/Gnome.Keyring.*
 
 
 %changelog
+* Mon Oct 31 2011 Christian Krause <chkr at fedoraproject.org> - 1.0.1-0.9.133722svn
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Fri Feb 25 2011 Dan Horák <dan[at]danny.cz> - 1.0.1-0.8.133722svn
 - updated the supported arch list