SPECS: gnome-do.spec - fixed build on lib64 systems - rewrite gnom...

[qboosh]

Author: qboosh                       Date: Sat Feb  9 22:30:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build on lib64 systems
- rewrite gnome-do start script (FUBAR)

---- Files affected:
SPECS:
   gnome-do.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/gnome-do.spec
diff -u SPECS/gnome-do.spec:1.3 SPECS/gnome-do.spec:1.4
--- SPECS/gnome-do.spec:1.3	Sat Feb  9 22:44:11 2008
+++ SPECS/gnome-do.spec	Sat Feb  9 23:30:18 2008
@@ -36,6 +36,14 @@
 %prep
 %setup -q -n do-0.3
 
+# rewrite script: kill build paths, use proper libdir, avoid . in library path
+cat > Do/gnome-do.in <<'EOF'
+#!/bin/sh
+
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}%{_libdir}/tomboy"
+exec mono "%{_libdir}/do/Do.exe" "$@"
+EOF
+
 %build
 %{__aclocal}
 %{__autoconf}
@@ -47,7 +55,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	linuxpkgconfigdir=%{_pkgconfigdir}
 
 %find_lang %{name} --with-gnome
 
@@ -58,9 +67,12 @@
 %defattr(644,root,root,755)
 %doc AUTHORS
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/do
+%dir %{_libdir}/do
+%{_libdir}/do/Do.exe
+%{_libdir}/do/Do.*.dll
 %{_desktopdir}/gnome-do.desktop
-%{_pkgconfigdir}/do.*.pc
+%{_pkgconfigdir}/do.addins.pc
+%{_pkgconfigdir}/do.dbus.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -68,6 +80,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2008-02-09 22:30:18  qboosh
+- fixed build on lib64 systems
+- rewrite gnome-do start script (FUBAR)
+
 Revision 1.3  2008-02-09 21:44:11  qboosh
 - pl
 
================================================================

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