rpms/etoys/devel etoys.spec,1.13,1.14

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27904

Modified Files:
	etoys.spec 
Log Message:
- cleanup spec and update to various package guidelines


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- etoys.spec	1 Dec 2009 09:03:05 -0000	1.13
+++ etoys.spec	10 Jan 2010 21:00:59 -0000	1.14
@@ -1,26 +1,23 @@
-%define name    etoys
-%define version 4.0.2339
-%define release 1%{?dist}
-%define source  %{name}-%{version}
-
-Name:           %{name}
+Name:           etoys
+Version:        4.0.2339
+Release:        2%{?dist}
 Summary:        A media-rich model, game, and simulation construction kit and authoring tool
-Version:        %{version}
-Release:        %{release}
 Vendor:         Viewpoints Research
-URL:            http://squeakland.org/
+
+Group:          Development/Languages
 License:        ASL 2.0 and MIT
-BuildArchitectures: noarch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source:         http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-%{version}.tar.gz
+URL:            http://squeakland.org/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Source0:        http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-%{version}.tar.gz
 Source2:        etoys.desktop
 Source3:        etoys.png
-Group:          Development/Languages
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 Requires:       squeak-vm >= 3.10
 Requires:       shared-mime-info
-BuildRequires:  gettext
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
 # the macro find_lang assumes .mo files are in .../share/locale/...
 #  but etoys puts them in .../share/etoys/locale/...
@@ -30,36 +27,32 @@ Requires(postun): desktop-file-utils
 %define localebug 1
 
 %description
-Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard,
-and starLOGO. It is a media-rich authoring environment with a
-simple powerful scripted object model for many kinds of objects
-created by end-users that runs on many platforms, and is free
-and open source. It includes 2D and 3D graphics, images, text,
-particles, pres-entations, web-pages, videos, sound and MIDI, etc.
-It includes the ability to share desktops with other Etoy users
-in real-time, so many forms of immersive mentoring and play can
-be done over the Internet.
-
-%package sugar
-Summary: Sugar activity wrapper for Etoys
-Group:   Sugar/Activities
-Requires: sugar
-Requires: etoys
+Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, and starLOGO. It 
+is a media-rich authoring environment with a simple powerful scripted object 
+model for many kinds of objects created by end-users that runs on many 
+platforms, and is free and open source. It includes 2D and 3D graphics, images, 
+text, particles, pres-entations, web-pages, videos, sound and MIDI, etc. It 
+includes the ability to share desktops with other Etoy users in real-time, so 
+many forms of immersive mentoring and play can be done over the Internet.
+
+%package       sugar
+Summary:       Sugar activity wrapper for Etoys
+Group:         Sugar/Activities
+Requires:      sugar
+Requires:      etoys
 
-%description sugar
+%description   sugar
 A Sugar activity that launches Etoys within the Sugar environment.
 
 %prep
-%setup -q -n %{source}
-cp -p %SOURCE2 .
-cp -p %SOURCE3 .
+%setup -q
 
 %build
 ./autogen.sh --prefix=%{_prefix}
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 make install-etoys install-activity ROOT=%{buildroot}
 
 # FIXME:
@@ -71,23 +64,24 @@ cp %{buildroot}%{_datadir}/sugar/activit
 # these files will be put in std RPM doc location
 rm -rf %{buildroot}%{_datadir}/doc/etoys
 
-install -D --mode=u=rw,go=r etoys.desktop %{buildroot}%{_datadir}/applications/etoys.desktop
-install -D --mode=u=rw,go=r etoys.png %{buildroot}%{_datadir}/pixmaps/etoys.png
+install -Dm 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/etoys.png 
+
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %if 0 == 0%{?localebug}
 %find_lang %{name}
 %endif
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 
 %post
-/usr/bin/update-mime-database /usr/share/mime &> /dev/null
-update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 
 %postun
-/usr/bin/update-mime-database /usr/share/mime &> /dev/null
-update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 
 %if 0 == 0%{?localebug}
 %files -f %{name}.lang
@@ -148,6 +142,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/sugar/activities/*
 
 %changelog
+* Sun Jan 10 2010 Peter Robinson <pbrobinson at gmail.com> - 4.0.2339-2
+- cleanup spec and update to various package guidelines
+
 * Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 4.0.2339-1
 - new upstream release
 
@@ -158,10 +155,10 @@ update-desktop-database &> /dev/null || 
 - lastest upstream release 4.0.2332
 
 * Thu Oct 1 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2319-1
-- lastest upstream release 4.0.2319	
+- lastest upstream release 4.0.2319
 
 * Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
-- lastest upstream release 4.0.2279	
+- lastest upstream release 4.0.2279
 
 * Fri Sep  4 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2258-1
 - pulled in latest upstream release 4.0.2258