rpms/sugar-update-control/F-10 python25.patch, NONE, 1.1 sugar-update-control.spec, 1.1, 1.2
Steven M. Parrish
tuxbrewr at fedoraproject.org
Mon Mar 9 21:51:48 UTC 2009
Author: tuxbrewr
Update of /cvs/pkgs/rpms/sugar-update-control/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28271
Modified Files:
sugar-update-control.spec
Added Files:
python25.patch
Log Message:
Fix broken deps
python25.patch:
--- NEW FILE python25.patch ---
diff -crB sugar-update-control-0.20/bitfrost/update/actinfo.py sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py
*** sugar-update-control-0.20/bitfrost/update/actinfo.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/bitfrost/update/actinfo.py 2009-03-09 06:30:38.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
diff -crB sugar-update-control-0.20/bitfrost/update/actutils.py sugar-update-control-0.20-fedora/bitfrost/update/actutils.py
*** sugar-update-control-0.20/bitfrost/update/actutils.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/bitfrost/update/actutils.py 2009-03-09 06:30:57.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
diff -crB sugar-update-control-0.20/bitfrost/update/microformat.py sugar-update-control-0.20-fedora/bitfrost/update/microformat.py
*** sugar-update-control-0.20/bitfrost/update/microformat.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/bitfrost/update/microformat.py 2009-03-09 06:31:25.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
diff -crB sugar-update-control-0.20/bitfrost/util/urlrange.py sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py
*** sugar-update-control-0.20/bitfrost/util/urlrange.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/bitfrost/util/urlrange.py 2009-03-09 06:30:08.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
diff -crB sugar-update-control-0.20/src/model.py sugar-update-control-0.20-fedora/src/model.py
*** sugar-update-control-0.20/src/model.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/src/model.py 2009-03-09 06:28:48.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
diff -crB sugar-update-control-0.20/src/view.py sugar-update-control-0.20-fedora/src/view.py
*** sugar-update-control-0.20/src/view.py 2009-02-19 05:05:13.000000000 -0500
--- sugar-update-control-0.20-fedora/src/view.py 2009-03-09 06:29:18.000000000 -0400
***************
*** 1,4 ****
! #!/usr/bin/python2.5
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
--- 1,4 ----
! #!/usr/bin/python
# Copyright (C) 2008 One Laptop Per Child Association, Inc.
# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
# Written by C. Scott Ananian <cscott at laptop.org>
Index: sugar-update-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/F-10/sugar-update-control.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-update-control.spec 8 Mar 2009 09:12:00 -0000 1.1
+++ sugar-update-control.spec 9 Mar 2009 21:51:18 -0000 1.2
@@ -3,14 +3,18 @@
Summary: Activity update control panel for Sugar
Name: sugar-update-control
Version: 0.20
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://git.sugarlabs.org/projects/sugar-update-control
Source0: %{name}-%{version}.tar.gz
+Patch0: python25.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: olpc-update >= 2.13, sugar >= 0.83.0
-BuildRequires: gettext, intltool, python-devel, python-distutils-extra
+Requires: sugar >= 0.83.0
+BuildRequires: gettext
+BuildRequires: intltool
+BuildRequires: python-devel
+BuildRequires: python-distutils-extra
BuildArch: noarch
%description
@@ -19,6 +23,7 @@
%prep
%setup -q
+%patch0 -p1 -b .py25
%build
%{__python} setup.py build
@@ -27,6 +32,7 @@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT
+
# avoid conflicts with standard __init__.py*
rm $RPM_BUILD_ROOT%{python_sitelib}/{bitfrost,bitfrost/update,bitfrost/util}/__init__.py*
%find_lang %{name}
@@ -45,10 +51,12 @@
%{_datadir}/sugar/extensions/cpsection/
%changelog
+* Sun Mar 08 2009 <tuxbrewr at fedoraproject.org> 0.20-4
+- Fix missing deps
+
* Sat Mar 07 2009 <bernie at codewiz.org> - 0.20-3
- Merge with tuxbrewr spec
-
* Thu Mar 05 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 0.20-2
- Fix license and files
More information about the fedora-extras-commits
mailing list