rpms/sugar-journal/OLPC-3 sugar-journal.spec, 1.14, 1.15 setup.patch, 1.1, NONE

[Marco Pesenti Gritti]

Author: mpg

Update of /cvs/pkgs/rpms/sugar-journal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4203

Modified Files:
	sugar-journal.spec 
Removed Files:
	setup.patch 
Log Message:
Resync with rawhide


Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sugar-journal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sugar-journal.spec	28 Aug 2008 12:42:04 -0000	1.14
+++ sugar-journal.spec	12 Sep 2008 08:35:14 -0000	1.15
@@ -2,8 +2,8 @@
 %define alphatag 20080822git%{commitid}
 
 Name:           sugar-journal
-Version:        98
-Release:        1%{?dist}
+Version:        99
+Release:        3%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
 
@@ -15,7 +15,6 @@
 # cd journal-activity
 # git-checkout %{commitid}
 #Source0:        Journal-%{version}-git%{commitid}.tar.bz2
-Patch0:         setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python sugar-toolkit git-core gettext
@@ -29,90 +28,35 @@
 
 %prep
 %setup -q -n Journal-%{version}
-%patch0 -p1 -b .setup
 
 %build
-
+python ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-python setup.py build
-python setup.py install $RPM_BUILD_ROOT%{sugaractivitydir}
-chmod +x $RPM_BUILD_ROOT%{sugaractivitydir}/Journal.activity/setup.py
+python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
+
+%find_lang org.laptop.JournalActivity
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f org.laptop.JournalActivity.lang
 %defattr(-,root,root,-)
-%dir %{sugaractivitydir}/Journal.activity/
-%doc %{sugaractivitydir}/Journal.activity/NEWS
-%{sugaractivitydir}/Journal.activity/activity/
-%{sugaractivitydir}/Journal.activity/*.py*
-%{sugaractivitydir}/Journal.activity/icons/
-#%{sugaractivitydir}/Journal.activity/po/
-%dir %{sugaractivitydir}/Journal.activity/locale/
-%lang(af) %{sugaractivitydir}/Journal.activity/locale/af/
-%lang(am) %{sugaractivitydir}/Journal.activity/locale/am/
-%lang(ar) %{sugaractivitydir}/Journal.activity/locale/ar/
-%lang(ay) %{sugaractivitydir}/Journal.activity/locale/ay/
-%lang(bg) %{sugaractivitydir}/Journal.activity/locale/bg/
-%lang(bn) %{sugaractivitydir}/Journal.activity/locale/bn/
-%lang(bn_IN) %{sugaractivitydir}/Journal.activity/locale/bn_IN/
-%lang(ca) %{sugaractivitydir}/Journal.activity/locale/ca/
-%lang(de) %{sugaractivitydir}/Journal.activity/locale/de/
-%lang(dz) %{sugaractivitydir}/Journal.activity/locale/dz/
-%lang(el) %{sugaractivitydir}/Journal.activity/locale/el/
-%lang(en) %{sugaractivitydir}/Journal.activity/locale/en/
-%lang(es) %{sugaractivitydir}/Journal.activity/locale/es/
-%lang(fa) %{sugaractivitydir}/Journal.activity/locale/fa/
-%lang(fa_AF) %{sugaractivitydir}/Journal.activity/locale/fa_AF/
-%lang(ff) %{sugaractivitydir}/Journal.activity/locale/ff/
-%lang(fr) %{sugaractivitydir}/Journal.activity/locale/fr/
-%lang(gu) %{sugaractivitydir}/Journal.activity/locale/gu/
-%lang(hi) %{sugaractivitydir}/Journal.activity/locale/hi/
-%lang(ht) %{sugaractivitydir}/Journal.activity/locale/ht/
-%lang(ig) %{sugaractivitydir}/Journal.activity/locale/ig/
-%lang(is) %{sugaractivitydir}/Journal.activity/locale/is/
-%lang(it) %{sugaractivitydir}/Journal.activity/locale/it/
-%lang(ja) %{sugaractivitydir}/Journal.activity/locale/ja/
-%lang(km) %{sugaractivitydir}/Journal.activity/locale/km/
-%lang(ko) %{sugaractivitydir}/Journal.activity/locale/ko/
-%lang(mk) %{sugaractivitydir}/Journal.activity/locale/mk/
-%lang(ml) %{sugaractivitydir}/Journal.activity/locale/ml/
-%lang(mn) %{sugaractivitydir}/Journal.activity/locale/mn/
-%lang(mr) %{sugaractivitydir}/Journal.activity/locale/mr/
-%lang(mvo) %{sugaractivitydir}/Journal.activity/locale/mvo/
-%lang(nb) %{sugaractivitydir}/Journal.activity/locale/nb/
-%lang(ne) %{sugaractivitydir}/Journal.activity/locale/ne/
-%lang(nl) %{sugaractivitydir}/Journal.activity/locale/nl/
-%lang(pa) %{sugaractivitydir}/Journal.activity/locale/pa/
-%lang(pap) %{sugaractivitydir}/Journal.activity/locale/pap/
-%lang(pis) %{sugaractivitydir}/Journal.activity/locale/pis/
-%lang(pl) %{sugaractivitydir}/Journal.activity/locale/pl/
-%lang(ps) %{sugaractivitydir}/Journal.activity/locale/ps/
-%lang(pt) %{sugaractivitydir}/Journal.activity/locale/pt/
-%lang(pt_BR) %{sugaractivitydir}/Journal.activity/locale/pt_BR/
-%lang(qu) %{sugaractivitydir}/Journal.activity/locale/qu/
-%lang(ro) %{sugaractivitydir}/Journal.activity/locale/ro/
-%lang(ru) %{sugaractivitydir}/Journal.activity/locale/ru/
-%lang(rw) %{sugaractivitydir}/Journal.activity/locale/rw/
-%lang(sd) %{sugaractivitydir}/Journal.activity/locale/sd/
-%lang(si) %{sugaractivitydir}/Journal.activity/locale/si/
-%lang(sl) %{sugaractivitydir}/Journal.activity/locale/sl/
-%lang(te) %{sugaractivitydir}/Journal.activity/locale/te/
-%lang(th) %{sugaractivitydir}/Journal.activity/locale/th/
-%lang(tpi) %{sugaractivitydir}/Journal.activity/locale/tpi/
-%lang(tr) %{sugaractivitydir}/Journal.activity/locale/tr/
-%lang(ur) %{sugaractivitydir}/Journal.activity/locale/ur/
-%lang(vi) %{sugaractivitydir}/Journal.activity/locale/vi/
-%lang(yo) %{sugaractivitydir}/Journal.activity/locale/yo/
-%lang(zh_CN) %{sugaractivitydir}/Journal.activity/locale/zh_CN/
-%lang(zh_TW) %{sugaractivitydir}/Journal.activity/locale/zh_TW/
+%doc NEWS
+%{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-3
+- Obvious typo in the files
+
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-2
+- Fixup packaging for the new bundlebuilder
+
+* Thu Sep 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 99-1
+- #8287 8.2-757: Copy-to-clipboard broken in Journal
+
 * Thu Aug 28 2008 Simon Schampijer <simon at laptop.org> - 98-1
 - 7588 Sugar should provide messages indicating when NAND is 'getting full' and 'critically full'
 - 6800 Journal window should be mirrored in RTL locales 


--- setup.patch DELETED ---