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

[Christian Krause]

commit d92859e36eb04f7eceb63f88c2f49694a7fdb8aa
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Jun 6 01:49:52 2012 +0200

    Change paths for mono assemblies according to updated packaging
    guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
    Use dbus-sharp instead of deprecated ndesk-dbus

 notify-sharp-0.4.0-use-dbus-sharp.patch |   56 +++++++++++++++++++++++++++++++
 notify-sharp.spec                       |   23 +++++++++----
 2 files changed, 72 insertions(+), 7 deletions(-)
---
diff --git a/notify-sharp-0.4.0-use-dbus-sharp.patch b/notify-sharp-0.4.0-use-dbus-sharp.patch
new file mode 100644
index 0000000..80fb2c3
--- /dev/null
+++ b/notify-sharp-0.4.0-use-dbus-sharp.patch
@@ -0,0 +1,56 @@
+diff -urN notify-sharp-0.4.0.old//configure.ac notify-sharp-0.4.0/configure.ac
+--- notify-sharp-0.4.0.old//configure.ac	2007-06-11 17:45:45.000000000 +0000
++++ notify-sharp-0.4.0/configure.ac	2011-07-07 05:08:01.751940314 +0000
+@@ -66,11 +66,11 @@
+ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION)
+ AC_SUBST(GTK_SHARP_LIBS)
+ 
+-NDESK_DBUS_REQ_VERSION=0.4
+-NDESK_DBUS_GLIB_REQ_VERSION=0.3
+-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
+-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION)
+-AC_SUBST(NDESK_DBUS_LIBS)
++DBUS_SHARP_REQ_VERSION=0.7
++DBUS_SHARP_GLIB_REQ_VERSION=0.5
++PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
++                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION)
++AC_SUBST(DBUS_SHARP_LIBS)
+ 
+ required_assemblies="Mono.Posix"
+ 
+diff -urN notify-sharp-0.4.0.old//src/Global.cs notify-sharp-0.4.0/src/Global.cs
+--- notify-sharp-0.4.0.old//src/Global.cs	2007-06-11 17:45:45.000000000 +0000
++++ notify-sharp-0.4.0/src/Global.cs	2011-07-07 05:02:18.692940330 +0000
+@@ -24,7 +24,7 @@
+ using System.Reflection;
+ using System.Collections.Generic;
+ 
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop;
+ using org.freedesktop.DBus;
+ 
+diff -urN notify-sharp-0.4.0.old//src/Makefile.am notify-sharp-0.4.0/src/Makefile.am
+--- notify-sharp-0.4.0.old//src/Makefile.am	2007-06-11 17:45:45.000000000 +0000
++++ notify-sharp-0.4.0/src/Makefile.am	2011-07-07 05:03:05.599940327 +0000
+@@ -7,7 +7,7 @@
+ LIBFLAGS = \
+ 	-r:Mono.Posix \
+ 	$(GTK_SHARP_LIBS) \
+-	$(NDESK_DBUS_LIBS)
++	$(DBUS_SHARP_LIBS)
+ 
+ CSFILES = \
+ 	$(srcdir)/Global.cs \
+diff -urN notify-sharp-0.4.0.old//src/Notification.cs notify-sharp-0.4.0/src/Notification.cs
+--- notify-sharp-0.4.0.old//src/Notification.cs	2007-06-11 17:45:45.000000000 +0000
++++ notify-sharp-0.4.0/src/Notification.cs	2011-07-07 05:05:10.196940327 +0000
+@@ -28,7 +28,7 @@
+ using Gdk;
+ using Gtk;
+ 
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop;
+ using org.freedesktop.DBus;
+ 
diff --git a/notify-sharp.spec b/notify-sharp.spec
index b677e28..edcb2fd 100644
--- a/notify-sharp.spec
+++ b/notify-sharp.spec
@@ -3,7 +3,7 @@
 
 Name:           notify-sharp
 Version:        0.4.0
-Release:        0.17.%{svndate}svn%{?dist}
+Release:        0.18.%{svndate}svn%{?dist}
 Summary:        A C# implementation for Desktop Notifications
 
 Group:          System Environment/Libraries
@@ -12,9 +12,12 @@ URL:            http://trac.galago-project.org/wiki/DesktopNotifications
 #svn checkout, revision 3032. To reproduce tarball:
 #svn co -r 3032  http://svn.galago-project.org/trunk/notify-sharp notify-sharp-20100411 && tar -cvjf notify-sharp-20100411.tar.bz2 notify-sharp-20100411
 Source0:        %{name}-%{svndate}.tar.bz2
+#use dbus-sharp instead of deprecated ndesk-dbus
+#patch is a modifed version of https://build.opensuse.org/package/view_file?file=notify-sharp-use-dbus-sharp.patch&package=notify-sharp&project=Mono%3ACleanup
+Patch0:         notify-sharp-0.4.0-use-dbus-sharp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-devel, gtk-sharp2-devel, gnome-sharp-devel, ndesk-dbus-glib-devel
+BuildRequires:  mono-devel, gtk-sharp2-devel, gnome-sharp-devel, dbus-sharp-glib-devel
 BuildRequires:  autoconf, automake, libtool
 
 BuildRequires:  monodoc-devel
@@ -51,18 +54,19 @@ Documentation files for notify-sharp
 
 %prep
 %setup -qn %{name}-%{svndate}
-
-sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' notify-sharp.pc.in
+%patch0 -p1 -b .use_dbus_sharp
 
 %build
 autoreconf --install
-%configure
+%configure --libdir=%{_prefix}/lib
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
+test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README AUTHORS
-%{_libdir}/mono/gac/notify-sharp/
-%{_libdir}/mono/notify-sharp/
+%{_prefix}/lib/mono/gac/notify-sharp/
+%{_prefix}/lib/mono/notify-sharp/
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/monodoc/sources/*
 
 %changelog
+* Wed Jun 06 2012 Christian Krause <chkr at fedoraproject.org> - 0.4.0-0.18.20100411svn
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+- Use dbus-sharp instead of deprecated ndesk-dbus
+
 * Wed May 09 2012 Karsten Hopp <karsten at redhat.com> 0.4.0-0.17.20100411svn
 - fix PPC filelist