rpms/sugar-calculator/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-calculator.spec, 1.1, 1.2

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/sugar-calculator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23801

Modified Files:
	.cvsignore sources sugar-calculator.spec 
Log Message:
* Wed Nov 12 2008 Jeremy Katz <katzj at redhat.com> - 23-2
- install sharedstate bits (#468816)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2008 17:50:54 -0000	1.2
+++ .cvsignore	12 Nov 2008 22:34:27 -0000	1.3
@@ -1 +1 @@
-Calculate-23.tar.bz2
+sharedstate-20081112.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2008 17:50:54 -0000	1.2
+++ sources	12 Nov 2008 22:34:27 -0000	1.3
@@ -1 +1 @@
-e708a969301ed8d800e2f7945930f522  Calculate-23.tar.bz2
+d15489202ddc5570cd17f01f6329875b  sharedstate-20081112.tar.bz2


Index: sugar-calculator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/F-10/sugar-calculator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-calculator.spec	18 Sep 2008 17:52:07 -0000	1.1
+++ sugar-calculator.spec	12 Nov 2008 22:34:27 -0000	1.2
@@ -1,11 +1,14 @@
 Name: sugar-calculator
 Version: 23
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Calculator for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.laptop.org/go/Calculate
 Source0: http://dev.laptop.org/pub/sugar/sources/calculate-activity/Calculate-%{version}.tar.bz2
+# git clone git://dev.laptop.org/projects/sharedstate
+# git-archive --format tar --prefix sharedstate/ 0b5862c3d22eac622a4363c0ff44c6497c58b9d6 | bzip2 > ../sharedstate-20081112.tar.bz2
+Source1: sharedstate-20081112.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
 Requires: sugar
@@ -15,7 +18,7 @@
 The calculate activity provides a calculator for the Sugar interface.
 
 %prep
-%setup -q -n Calculate-%{version}
+%setup -q -n Calculate-%{version} -a 1
 
 # remove bogus pseudo locale
 rm -f po/pseudo.po
@@ -27,6 +30,8 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
 python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
+# install sharedstate stuff
+cp -r sharedstate/sharedstate $RPM_BUILD_ROOT/%{_datadir}/sugar/activities/Calculate.activity
 
 %find_lang org.laptop.Calculate
 
@@ -41,6 +46,9 @@
 
 
 %changelog
+* Wed Nov 12 2008 Jeremy Katz <katzj at redhat.com> - 23-2
+- install sharedstate bits (#468816)
+
 * Tue Sep  2 2008 Jeremy Katz <katzj at redhat.com> - 23-1
 - update to Calculate-23
 - use %%find_lang