[sugar-implode/f17] fix merge 2
Peter Robinson
pbrobinson at fedoraproject.org
Sat May 19 12:48:08 UTC 2012
commit 33fff4012d3de5c5166a57c9b786fbf2b347ea26
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sat May 19 13:47:58 2012 +0100
fix merge 2
sugar-implode.spec | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/sugar-implode.spec b/sugar-implode.spec
index 8647920..dcc9733 100644
--- a/sugar-implode.spec
+++ b/sugar-implode.spec
@@ -1,21 +1,13 @@
%global shortname implode
Name: sugar-%{shortname}
-<<<<<<< HEAD
-Version: 10
-=======
Version: 12
->>>>>>> master
Release: 1%{?dist}
Summary: Implode for Sugar
Group: Sugar/Activities
License: GPLv2+
URL: http://wiki.sugarlabs.org/go/Activities/Implode
Source0: http://download.sugarlabs.org/activities/4086/%{shortname}-%{version}.xo
-<<<<<<< HEAD
-Source1: sugar-implode-checkout.sh
-=======
->>>>>>> master
BuildArch: noarch
BuildRequires: gettext
BuildRequires: python
@@ -39,17 +31,10 @@ always a sequence of removals that clears the board.
%setup -q -n Implode.activity
%build
-<<<<<<< HEAD
-%{__python} setup.py build
-
-%install
-%{__python} setup.py install --prefix=%{buildroot}/%{_prefix}
-=======
python ./setup.py build
%install
python ./setup.py install --prefix=%{buildroot}/%{_prefix}
->>>>>>> master
#executables
find %{buildroot}%{sugaractivitydir}Implode.activity/*.py -type f | xargs chmod a+x
for file in %{buildroot}%{sugaractivitydir}Implode.activity/{board,boardgen,color,gridwidget,implodeactivity,implodegame,setup}.py; do
@@ -62,12 +47,9 @@ done
%{sugaractivitydir}/Implode.activity/
%changelog
-<<<<<<< HEAD
-=======
* Sat May 19 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 12-1
- Release 12
->>>>>>> master
* Thu Mar 8 2012 Tom Callaway <spot at fedoraproject.org> - 10-1
- update to v10
More information about the scm-commits
mailing list