SPECS: gnome-do.spec - fixed installation with lib64 - mono runtim...

[qboosh]

Author: qboosh                       Date: Thu Apr 17 16:21:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed installation with lib64
- mono runtime deps are autodetected

---- Files affected:
SPECS:
   gnome-do.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/gnome-do.spec
diff -u SPECS/gnome-do.spec:1.10 SPECS/gnome-do.spec:1.11
--- SPECS/gnome-do.spec:1.10	Thu Apr 17 11:13:00 2008
+++ SPECS/gnome-do.spec	Thu Apr 17 18:21:21 2008
@@ -10,17 +10,18 @@
 Source0:	https://launchpad.net/do/trunk/0.4/+download/%{name}-%{version}.tar.gz
 # Source0-md5:	ff3a5d225fd0f23d1357a1e0e461fded
 URL:		http://do.davebsd.com/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	dotnet-gnome-sharp-devel
 BuildRequires:	dotnet-gtk-sharp2-devel
 BuildRequires:	dotnet-ndesk-dbus-glib-sharp-devel
 BuildRequires:	dotnet-ndesk-dbus-sharp-devel
+BuildRequires:	gtk+2-devel >= 1:2.0
+BuildRequires:	libtool
 BuildRequires:	mono-csharp >= 1.1.13
-Requires:       dotnet-gnome-sharp
-Requires:       dotnet-gtk-sharp2
-Requires:       dotnet-ndesk-dbus-sharp
-Requires:       dotnet-ndesk-glib-sharp
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(monoautodeps)
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,7 +52,10 @@
 %prep
 %setup -q
 
+sed -i -e 's/^pkglib_SCRIPTS =/DLLFILES =/;s/^programfiles_DATA.*/& $(DLLFILES)/' Makefile.include
+
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -60,13 +64,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_datadir}/gnome-do/plugins
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	linuxpkgconfigdir=%{_pkgconfigdir}
 
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-do/*.la
+
 %find_lang %{name} --with-gnome
 
 %clean
@@ -76,13 +81,15 @@
 %defattr(644,root,root,755)
 %doc AUTHORS
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/gnome-do
+%attr(755,root,root) %{_libdir}/gnome-do/*.so
+%if "%{_prefix}/lib" != "%{_libdir}"
 %dir %{_prefix}/lib/gnome-do
+%endif
 %{_prefix}/lib/gnome-do/Do.exe
 %{_prefix}/lib/gnome-do/Do.exe.config
 %{_prefix}/lib/gnome-do/Do.*.dll
 %{_prefix}/lib/gnome-do/Do.*.dll.mdb
-%dir %{_libdir}/gnome-do
-%{_libdir}/gnome-do/*.so
 %dir %{_datadir}/gnome-do
 %dir %{_datadir}/gnome-do/plugins
 %{_desktopdir}/gnome-do.desktop
@@ -98,6 +105,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008-04-17 16:21:21  qboosh
+- fixed installation with lib64
+- mono runtime deps are autodetected
+
 Revision 1.10  2008-04-17 09:13:00  czarny
 - ndesk and gnome BR's
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-do.spec?r1=1.10&r2=1.11&f=u