[Etoys] etoys.spec: changes needed for inclusion in Fedora

Gavin Romig-Koch gavin at redhat.com
Mon Nov 17 17:46:06 EST 2008

I have been making changes to the etoys.spec file, so that EToys might 
get included into Fedora.  The attached patch to 
git://dev.laptop.org/projects/etoys are the changes that I believe are 
necessary to propose EToy's inclusion in Fedora.

If you are willing to accept these changes into your git repo, then I 
can simply use your spec file and SRPM as the ones submitted to 
Fedora.   If not, that's OK too, I'll just host them somewhere else 
pending inclusion into Fedora.


This is a short explanation for each of the changes, if you need more 
explanation, please ask:

- added %{?dist} to release

    Fedora requires %{?dist} be added to all releases - it results in nothing on distro's that don't define 'dist'

- altered the License field to use cononical License short names

    Fedora requires specific short names for this field to ease License checking

- remove the Prefix (relocatable) field

    Fedora discourages relocatable RPMs.  They are allowed, but require added work, testing, and justification.   I didn't think the EToy's RPM needed to be relocatable.   If you think it needs to be relocateable, let me know and I'll add it.

- added .desktop file and etoys icon.

    Fedora requires a .desktop file for each 'desktop' application.

-------------- next part --------------
diff --git a/etoys.desktop b/etoys.desktop
new file mode 100644
index 0000000..9767c19
--- /dev/null
+++ b/etoys.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+GenericName=The EToys Environment
+Comment=starts EToys
diff --git a/etoys.spec b/etoys.spec
index 667e380..5d433af 100644
--- a/etoys.spec
+++ b/etoys.spec
@@ -1,6 +1,6 @@
 %define name    etoys
 %define version 3.0.2160
-%define release 1
+%define release 1%{?dist}
 %define source  %{name}-%{version}
 Name:		%{name}
@@ -9,12 +9,12 @@ Version:	%{version}
 Release:	%{release}
 Vendor:		Viewpoints Research
 URL:		http://squeakland.org/
-License:	MIT/Apache
+License:	ASL 2.0 and MIT
 BuildArchitectures: noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source:		%{source}.tar.gz
+Source2:        etoys.desktop
 Group:		Development/Languages
-Prefix:		/usr
 Requires:	squeak-vm >= 3.10
 Requires:	shared-mime-info
 BuildRequires:	gettext
@@ -32,31 +32,49 @@ be done over the Internet.
 %setup -n %{source}
+cp -p %SOURCE2 .
-./autogen.sh --prefix=/usr
+./autogen.sh --prefix=%{_prefix}
 make ROOT=%{buildroot} %{?_smp_mflags}
 [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}"
 make install-etoys ROOT=%{buildroot}
+# these files will be put in std RPM doc location
+rm -rf %{buildroot}%{_datadir}/doc/etoys
+install -D etoys.desktop %{buildroot}%{_datadir}/applications/etoys.desktop
+install -D activity-etoys.svg %{buildroot}%{_datadir}/pixmaps/activity-etoys.svg
 [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}"
 /usr/bin/update-mime-database /usr/share/mime &> /dev/null
+update-desktop-database &> /dev/null || :
 /usr/bin/update-mime-database /usr/share/mime &> /dev/null
+update-desktop-database &> /dev/null || :
+* Fri Nov 14 2008 Gavin Romig-Koch <gavin at redhat.com>
+- added %{?dist} to release
+- altered the License field to use cononical License short names
+- remove the Prefix (relocatable) field
+- added .desktop file and etoys icon.
 * Wed Oct 29 2008 Bert Freudenberg <bert at freudenbergs.de>
 - 3.0.2160-1

More information about the etoys-dev mailing list