[clean] Fix name-version syntax

[Patrick Uiterwijk]

commit 40b7393bb8818071d9c700960550ea4e5a23b5f2
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Mon Apr 22 11:27:33 2013 +0200

    Fix name-version syntax
    
    - Fix x86 arch bits, fix sub package NV requires

 .gitignore |    1 +
 clean.spec |   76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources    |    1 +
 3 files changed, 74 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88d104e..9ef0a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /clean2.4_64_boot.tar.gz
 /clean2.4_boot.tar.gz
+/Clean2.4Sources.zip
diff --git a/clean.spec b/clean.spec
index c93f6d7..1ac65cb 100644
--- a/clean.spec
+++ b/clean.spec
@@ -13,7 +13,7 @@
 
 Name:           clean
 Version:        2.4
-Release:        14%{?dist}
+Release:        13%{?dist}
 Group:          Development/Tools
 Summary:        The Clean language compiler
 License:        LGPLv2+ or BSD
@@ -24,6 +24,8 @@ Source0: http://clean.cs.ru.nl/download/Clean24/linux/%{name}%{version}_boot.tar
 Source1: http://clean.cs.ru.nl/download/Clean24/linux/%{name}%{version}_64_boot.tar.gz
 # This has been sent upstream 20-06-2012
 Source2: %{name}.htoclean.1
+# This archive is used to get the Directory, Gast, Parsers and WrapDebug libraries as those are not packages with the linux sources
+Source3: http://clean.cs.ru.nl/download/Clean24/windows/Clean%{version}Sources.zip
 # Has been sent upstream 28-06-2012
 Patch0: %{name}.makefiles.patch
 # Have been sent upstream 28-06-2012
@@ -91,6 +93,37 @@ Group: Documentation
 %description doc
 Documentation for the Clean compiler and libraries
 
+#%package directory
+#Summary: Directory module for Clean
+#Requires: %{name} = %{version}-%{release}
+#Group: Development/Libraries
+
+#%description directory
+#Directory manipulation modules for Clean
+
+%package Gast
+Summary: Model-based testing library for clean
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+
+%description Gast
+A library for testing applications based on a model
+
+%package parsers
+Summary: Natural text parsers for Clean
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+
+%description parsers
+Natural text parser modules for Clean
+
+%package wrapdebug
+Summary: A wrapper to emit more data types with debugging
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+
+%description wrapdebug
+A library to extend the debugging capabilities of Clean
 
 # The real building starts here
 %prep
@@ -108,6 +141,9 @@ cp -p %SOURCE2 .
 %patch3
 %patch4
 %patch5
+mkdir win
+cd win
+unzip %SOURCE3
 
 %build
 cd %{_builddir}/%{buildsubdir}/src
@@ -119,6 +155,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -s " CC=gcc
 cd %{_builddir}/%{buildsubdir}/lib/Generics
 %{_builddir}/%{buildsubdir}/bin/clm _Array || :
 
+
 # Patch clm to use the includes from _libdir directory
 %{_builddir}/%{buildsubdir}/bin/patch_bin %{_builddir}/%{buildsubdir}/bin/clm CLEANLIB %{_libexecdir}/%{name}
 %{_builddir}/%{buildsubdir}/bin/patch_bin %{_builddir}/%{buildsubdir}/bin/clm CLEANPATH ""
@@ -192,6 +229,27 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/TCPIP
 cp -p %{_builddir}/%{buildsubdir}/lib/TCPIP/*.icl %{buildroot}%{_libdir}/%{name}/TCPIP/
 cp -p %{_builddir}/%{buildsubdir}/lib/TCPIP/*.dcl %{buildroot}%{_libdir}/%{name}/TCPIP/
 cp -pr %{_builddir}/%{buildsubdir}/lib/TCPIP/Clean\ System\ Files %{buildroot}%{_libdir}/%{name}/TCPIP/
+#  Directory
+#mkdir -p %{buildroot}%{_libdir}/%{name}/Directory
+#cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Directory/*.icl %{buildroot}%{_libdir}/%{name}/Directory/
+#cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Directory/*.dcl %{buildroot}%{_libdir}/%{name}/Directory/
+#cp -pr %{_builddir}/%{buildsubdir}/win/Sources/libraries/Directory/Clean\ System\ Files %{buildroot}%{_libdir}/%{name}/Directory/
+#  Gast
+mkdir -p %{buildroot}%{_libdir}/%{name}/Gast
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Gast/*.icl %{buildroot}%{_libdir}/%{name}/Gast/
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Gast/*.dcl %{buildroot}%{_libdir}/%{name}/Gast/
+# DOCUMENTATION: /examples/
+#  Parsers
+mkdir -p %{buildroot}%{_libdir}/%{name}/Parsers
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Parsers/*.icl %{buildroot}%{_libdir}/%{name}/Parsers/
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/Parsers/*.dcl %{buildroot}%{_libdir}/%{name}/Parsers/
+cp -pr %{_builddir}/%{buildsubdir}/win/Sources/libraries/Parsers/LanguageDependent %{buildroot}%{_libdir}/%{name}/Parsers/
+# DOCUMENTATION: /MetarDemo, /Parsers\ Manual.doc
+#  WrapDebug
+mkdir -p %{buildroot}%{_libdir}/%{name}/WrapDebug
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/WrapDebug/*.icl %{buildroot}%{_libdir}/%{name}/WrapDebug/
+cp -p %{_builddir}/%{buildsubdir}/win/Sources/libraries/WrapDebug/*.dcl %{buildroot}%{_libdir}/%{name}/WrapDebug/
+# DOCUMENTATION: /Changes.txt, /README.txt
 
 # Copy man files
 cp -p %{_builddir}/%{buildsubdir}/man/man1/clm.1 %{buildroot}%{_mandir}/man1/
@@ -239,11 +297,21 @@ rm %{buildroot}%{_libdir}/%{name}/Generics/gentest.icl
 %files doc
 %doc doc/*
 
-%changelog
-* Tue Mar 26 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.4-14
-- Fix name-version syntax
+#%files directory
+#%{_libdir}/%{name}/Directory
 
+%files Gast
+%{_libdir}/%{name}/Gast
+
+%files parsers
+%{_libdir}/%{name}/Parsers
+
+%files wrapdebug
+%{_libdir}/%{name}/WrapDebug
+
+%changelog
 * Tue Mar 26 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.4-13
+- Fix name-version syntax
 - Fix x86 arch bits, fix sub package NV requires
 
 * Thu Sep 13 2012 Patrick Uiterwijk <puiterwijk at gmail.com> - 2.4-12
diff --git a/sources b/sources
index 01b3b3d..4881f22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 b715e981dc1ef6702c2f670ad888f9af  clean2.4_64_boot.tar.gz
 558dc5c85322617ea7138a9a6838c89f  clean2.4_boot.tar.gz
+4e15ea1c0ebe4207dee8e1fa8cf596eb  Clean2.4Sources.zip