diff options
author | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-04 14:08:10 (GMT) |
---|---|---|
committer | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-04 14:08:10 (GMT) |
commit | 47b427873cedf2e314f7e30803f6595ef047b6f8 (patch) | |
tree | f0a486e3f52b7bd629f52b99d719667a82cca4f2 | |
parent | fee82014d68343e32b570baa6af14d1604b720ca (diff) |
Updated spec files to match build script
-rw-r--r-- | rpms/sugar-artwork/sugar-artwork.spec | 8 | ||||
-rw-r--r-- | rpms/sugar-toolkit/sugar-toolkit.spec | 7 | ||||
-rw-r--r-- | rpms/sugar/sugar.spec | 10 |
3 files changed, 5 insertions, 20 deletions
diff --git a/rpms/sugar-artwork/sugar-artwork.spec b/rpms/sugar-artwork/sugar-artwork.spec index 5baef18..4573e74 100644 --- a/rpms/sugar-artwork/sugar-artwork.spec +++ b/rpms/sugar-artwork/sugar-artwork.spec @@ -4,11 +4,9 @@ Summary: Artwork for Sugar look-and-feel Name: sugar-artwork Epoch: 20120502 Version: 0.94.0 -Release: 2.dx3%{?dist} +Release: dx3 URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://people.sugarlabs.org/~silbe/dextrose/patchsets/%{name}-dx3-20120502.tar.gz - License: LGPLv2+ Group: User Interface/Desktops @@ -31,9 +29,7 @@ sugar-artwork contains the themes and icons that make up the Sugar default look and feel. %prep -%setup -T -c -a 1 -n patches -%setup -D -q -for patch in ../patches/* ; do patch -p1 < "${patch}" ; done +%setup -q %build autoreconf -i diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec index a0f3c7c..4f7f562 100644 --- a/rpms/sugar-toolkit/sugar-toolkit.spec +++ b/rpms/sugar-toolkit/sugar-toolkit.spec @@ -3,12 +3,11 @@ Summary: Sugar toolkit Name: sugar-toolkit Epoch: 1 -Version: 0.94.0 +Version: 0.94.1 Release: 20120425.dx3%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 Source1: macros.sugar -Source2: http://people.sugarlabs.org/~silbe/dextrose/patchsets/%{name}-dx3-20120425.tar.gz License: LGPLv2+ Group: System Environment/Libraries @@ -39,9 +38,7 @@ a set of widgets to build HIG compliant applications and interfaces to interact with system services like presence and the datastore. %prep -%setup -T -c -a 2 -n patches -%setup -D -q -for patch in ../patches/* ; do patch -p1 < "${patch}" ; done +%setup -q %build libtoolize diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 914ee09..6504fa7 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -7,11 +7,6 @@ Version: 0.94.1 Release: 31.dx3 URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://people.sugarlabs.org/silbe/dextrose/patchsets/%{name}-dx3-20120720.tar.gz - -# Insert development patches not included in patchset here -patch0: AUlangs.diff - License: GPLv2+ Group: User Interface/Desktops @@ -98,10 +93,7 @@ Requires: %{name} <= %{epoch}:%{version}-%{release} %description control-keyboard sugar-control-frame addon to sugar's control panel. %prep -%setup -T -c -a 1 -n patches -%setup -D -q -for patch in ../patches/* ; do patch -p1 < "${patch}" ; done -%patch0 -p0 +%setup -q %build autoreconf -i |