SPECS: tomboy.spec - fixed path to *.service, desktop - cosmetics

[pawcioos]

Author: pawcioos                     Date: Tue Aug 23 06:51:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed path to *.service, desktop
- cosmetics

---- Files affected:
SPECS:
   tomboy.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/tomboy.spec
diff -u SPECS/tomboy.spec:1.9 SPECS/tomboy.spec:1.10
--- SPECS/tomboy.spec:1.9	Mon Aug 22 16:51:48 2005
+++ SPECS/tomboy.spec	Tue Aug 23 08:51:02 2005
@@ -8,8 +8,7 @@
 Group:		X11/Applications
 Source0:	http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	7ad987216b484f747f53aa7f9055a46b
-Source1:	%{name}.desktop
-#Patch0:		%{name}-desktop.patch
+Patch0:		%{name}-desktop.patch
 URL:		http://www.beatniksoftware.com/tomboy/
 BuildRequires:	GConf2-devel
 BuildRequires:	atk-devel >= 1.2.4
@@ -45,7 +44,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -59,12 +58,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp data/tomboy.desktop $RPM_BUILD_ROOT%{_desktopdir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \
+	$RPM_BUILD_ROOT%{_datadir}/dbus-1/services/
 
 %find_lang %{name}
 
@@ -81,16 +82,16 @@
 %attr(755,root,root) %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.exe
 %{_libdir}/%{name}/*.config
+%{_libdir}/%{name}/*.exe
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %{_libdir}/%{name}/*.la
 %dir %{_libdir}/%{name}/Plugins
-%{_libdir}/dbus-1.0/services/*.service
-%{_libdir}/%{name}/Plugins/*.dll
-%{_libdir}/bonobo/servers/*
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/gnome-2.0/ui/*
 %{_desktopdir}/*.desktop
+%{_libdir}/%{name}/Plugins/*.dll
+%{_libdir}/bonobo/servers/*
 %{_mandir}/man1/tomboy.1*
 %{_pixmapsdir}/*.png
 %{_pkgconfigdir}/tomboy-plugins.pc
@@ -101,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/08/23 06:51:02  pawcioos
+- fixed path to *.service, desktop
+- cosmetics
+
 Revision 1.9  2005/08/22 14:51:48  pawcioos
 - updated to 0.3.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.9&r2=1.10&f=u