SPECS: dbus.spec - added monodir patch for mono dlls in /usr/lib -...

[qboosh]

Author: qboosh                       Date: Sat Dec  3 15:41:49 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added monodir patch for mono dlls in /usr/lib
- qt libdir fix (needed with multilib)

---- Files affected:
SPECS:
   dbus.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.108 SPECS/dbus.spec:1.109
--- SPECS/dbus.spec:1.108	Thu Dec  1 13:23:44 2005
+++ SPECS/dbus.spec	Sat Dec  3 16:41:44 2005
@@ -38,6 +38,7 @@
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-mint.patch
 Patch3:		%{name}-python_fixes.patch
+Patch4:		%{name}-monodir.patch
 URL:		http://www.freedesktop.org/Software/dbus
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.52
@@ -50,7 +51,7 @@
 %if %{with dotnet}
 # just gtk-sharp for examples
 BuildRequires:	dotnet-gtk-sharp-devel
-BuildRequires:	mono-csharp >= 0.95
+BuildRequires:	mono-csharp >= 1.1.7
 BuildRequires:	monodoc >= 1.0.7-2
 %endif
 BuildRequires:	libselinux-devel
@@ -208,7 +209,7 @@
 Summary(pl):	Biblioteka .NET do używania D-BUS
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	mono
+Requires:	mono >= 1.1.7
 
 %description -n dotnet-%{name}-sharp
 .NET library for using D-BUS.
@@ -327,7 +328,9 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in}
+sed -i -e 's/DBUS_QT_LIBS=.*/DBUS_QT_LIBS="-lqt-mt"/' configure.in
 
 %build
 %{__libtoolize}
@@ -365,9 +368,6 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
 install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/services
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
-%if %{with dotnet}
-install -d $RPM_BUILD_ROOT%{_libdir}/monodoc/sources
-%endif
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -500,14 +500,12 @@
 %if %{with dotnet}
 %files -n dotnet-%{name}-sharp
 %defattr(644,root,root,755)
-%dir %{_libdir}/mono/gac/dbus-sharp
-%{_libdir}/mono/gac/dbus-sharp/*
+%{_prefix}/lib/mono/gac/dbus-sharp
 
 %files -n dotnet-%{name}-sharp-devel
 %defattr(644,root,root,755)
+%{_prefix}/lib/mono/dbus-sharp
 %{_libdir}/monodoc/sources/*
-%dir %{_libdir}/mono/dbus-sharp
-%{_libdir}/mono/dbus-sharp/*
 %{_pkgconfigdir}/dbus-sharp.pc
 %endif
 
@@ -558,6 +556,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2005/12/03 15:41:44  qboosh
+- added monodir patch for mono dlls in /usr/lib
+- qt libdir fix (needed with multilib)
+
 Revision 1.108  2005/12/01 12:23:44  adgor
 - Fixed dotnet bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.108&r2=1.109&f=u