[squeak-image] New version

[Jaroslav Škarvada]

commit 1e30f46131e8ffe06223568316213c9e686cb67a
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Nov 23 15:41:34 2012 +0100

    New version

 .gitignore        |    4 +-
 sources           |    4 +-
 squeak-image.spec |   58 +++++++++++++++++++++++++++++++---------------------
 3 files changed, 38 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c77b8ff..8cc0b96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-Squeak3.10.2-7179-basic.zip
-SqueakV39.sources.gz
+Squeak*.zip
+SqueakV*.sources.gz
diff --git a/sources b/sources
index 37b5bf7..05021d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-759ed53867f6fb47a2a122cf4ff6b9e3  Squeak3.10.2-7179-basic.zip
-4fe515af7428dbe69e90126c78255db9  SqueakV39.sources.gz
+53aa6d39ae208e0c230941c29a5ebfbe  SqueakV41.sources.gz
+bb1bdc44981de59565947412c8ce4097  Squeak4.3.zip
diff --git a/squeak-image.spec b/squeak-image.spec
index 3c928b7..7a1c31b 100644
--- a/squeak-image.spec
+++ b/squeak-image.spec
@@ -1,28 +1,37 @@
-%define image_major 3.10
-%define image_ver %{image_major}.2
-%define image_rel 7179
+%global image_major 4
+%global image_minor 3
+%global sources_minor 1
+%global image_ver %{image_major}.%{image_minor}
+#%%global image_rel 10966
+
+%if 0%{?image_rel}
+%global image_prel .%{?image_rel}
+%global image_drel -%{?image_rel}
+%endif
+
+%global image_pfullver %{image_ver}%{?image_prel}
+%global image_dfullver %{image_ver}%{?image_drel}
 
 Name:           squeak-image
-Version:        %{image_ver}.%{image_rel}
-Release:        6%{?dist}
+Version:        %{image_pfullver}
+Release:        1%{?dist}
 Summary:        The image files for Squeak
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.squeak.org
-Source0:        http://ftp.squeak.org/%{image_major}/Squeak%{image_ver}-%{image_rel}-basic.zip
-Source1:        http://ftp.squeak.org/sources_files/SqueakV39.sources.gz
+Source0:        http://ftp.squeak.org/%{image_ver}/Squeak%{image_dfullver}.zip
+Source1:        http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
 Source2:        squeak-image-doc.html
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:       squeak-vm >= 3.7
+Requires:       squeak-vm >= 4.4.7.2357
 
 BuildArch:      noarch
 
-
 %description
 This is the standard Squeak image as distributed by sqeak.org.
-The Squeak image is split into three interdependent parts, 
+The Squeak image is split into three interdependent parts,
 the .image file, the .changes file, and the .sources file.
 
 %prep
@@ -34,31 +43,32 @@ cp -p %SOURCE2 .
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/squeak
-cp Squeak%{image_ver}-%{image_rel}-basic.image %{buildroot}%{_datadir}/squeak
-cp Squeak%{image_ver}-%{image_rel}-basic.changes %{buildroot}%{_datadir}/squeak
-zcat %{SOURCE1} >%{buildroot}%{_datadir}/squeak/SqueakV39.sources
+# For squeak-image 4.3 (and maybe later) there is a subdir
+[ -d Squeak%{image_dfullver} ] && cd Squeak%{image_dfullver}
+cp Squeak%{image_dfullver}.image %{buildroot}%{_datadir}/squeak
+cp Squeak%{image_dfullver}.changes %{buildroot}%{_datadir}/squeak
+zcat %{SOURCE1} >%{buildroot}%{_datadir}/squeak/SqueakV%{image_major}%{sources_minor}.sources
 cd %{buildroot}%{_datadir}/squeak
-gzip Squeak%{image_ver}-%{image_rel}-basic.image
-gzip Squeak%{image_ver}-%{image_rel}-basic.changes
-ln -sf Squeak%{image_ver}-%{image_rel}-basic.image.gz squeak.image.gz
-ln -sf Squeak%{image_ver}-%{image_rel}-basic.changes.gz squeak.changes.gz
-
-# inisqueak is looking for SqueakV3.sources (not V39), create this for it
-cd %{buildroot}%{_datadir}/squeak/
-ln -s SqueakV39.sources SqueakV3.sources
-
+gzip Squeak%{image_dfullver}.image
+gzip Squeak%{image_dfullver}.changes
+gzip SqueakV%{image_major}%{sources_minor}.sources
+ln -sf Squeak%{image_dfullver}.image.gz squeak.image.gz
+ln -sf Squeak%{image_dfullver}.changes.gz squeak.changes.gz
+ln -s SqueakV%{image_major}%{sources_minor}.sources.gz SqueakV%{image_major}.sources.gz
+ln -s SqueakV%{image_major}%{sources_minor}.sources.gz squeak.sources.gz
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc squeak-image-doc.html
 %{_datadir}/squeak/*
 
-
 %changelog
+* Mon Nov 05 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.3-1
+- New version
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.2.7179-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild