rpms/sugar-toolkit/devel macros.sugar, NONE, 1.1 sugar-toolkit.spec, 1.5, 1.6

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16571

Modified Files:
	sugar-toolkit.spec 
Added Files:
	macros.sugar 
Log Message:
add sugarlibdir and source the file rather than printing



--- NEW FILE macros.sugar ---
%sugaractivitydir /usr/share/sugar/activities/
%sugarlibdir %{_libdir}/sugar/activities/


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sugar-toolkit.spec	9 Apr 2008 21:11:24 -0000	1.5
+++ sugar-toolkit.spec	22 Apr 2008 16:09:58 -0000	1.6
@@ -3,9 +3,10 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.79.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+Source1: macros.sugar
 License: LGPLv2
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +42,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-printf %s%b "%" "sugaractivitydir /usr/share/activities/\n" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Apr 22 2008 Dennis Gilmore <dennis at ausil.us> - 0.79.3-4
+- Update rpm macros file adding sugarlibdir
+
 * Wed Apr 09 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.79.3
 - Added default to label arg in palette constructor (eben)