diff --git a/geronimo-specs.changes b/geronimo-specs.changes
index 927b757..aa07a77 100644
--- a/geronimo-specs.changes
+++ b/geronimo-specs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 17 09:12:41 CEST 2008 - mvyskocil@suse.cz
+
+- Dots in names was replaced by underscore
+- Added a PreReq on coreutils
+- Removed of BuildRoot removal in %install phase
+
 -------------------------------------------------------------------
 Mon Apr  7 17:16:32 CEST 2008 - mvyskocil@suse.cz
 
diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index c050d98..2a768f7 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -20,7 +20,7 @@
 
 Name:           geronimo-specs
 Version:        1.1
-Release:        2
+Release:        6
 Summary:        Geronimo J2EE server J2EE specifications
 Url:            http://geronimo.apache.org
 Source0:        %{name}-%{version}-src.tar.bz2
@@ -90,6 +90,9 @@ Requires:       ws-scout
 %endif
 # The main package has links to all specs, so it requires all subpackages
 # except j2ee-schema (not linked) and javadocs
+%if %defined suse_version
+PreReq:         coreutils
+%endif
 Requires:       geronimo-commonj-1.1-apis = %{version}-%{release}
 Requires:       geronimo-jaf-1.0.2-api = %{version}-%{release}
 Requires:       geronimo-corba-1.0-apis = %{version}-%{release}
@@ -140,19 +143,19 @@ Group:          Development/Documentation
 Javadoc for %{name}.
 %endif
 
-%package -n geronimo-commonj-1.1-apis
+%package -n geronimo-commonj-1_1-apis
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
 Requires:       %{name}-poms = %{version}-%{release}
 
-%description -n geronimo-commonj-1.1-apis
+%description -n geronimo-commonj-1_1-apis
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: CommonJ Spec
 
 
 
-%package -n geronimo-jaf-1.0.2-api
+%package -n geronimo-jaf-1_0_2-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -164,37 +167,37 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jaf-1.0.2-api
+%description -n geronimo-jaf-1_0_2-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Java Activation Framework
 
 
 
-%package -n geronimo-corba-1.0-apis
+%package -n geronimo-corba-1_0-apis
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
 Requires:       %{name}-poms = %{version}-%{release}
 
-%description -n geronimo-corba-1.0-apis
+%description -n geronimo-corba-1_0-apis
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: CORBA 1.0 Spec
 
 
 
-%package -n geronimo-corba-2.3-apis
+%package -n geronimo-corba-2_3-apis
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
 Requires:       %{name}-poms = %{version}-%{release}
 
-%description -n geronimo-corba-2.3-apis
+%description -n geronimo-corba-2_3-apis
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: CORBA 2.3 Spec
 
 
 
-%package -n geronimo-ejb-2.1-api
+%package -n geronimo-ejb-2_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -204,25 +207,25 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-ejb-2.1-api
+%description -n geronimo-ejb-2_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Enterprise JavaBeans Specification
 
 
 
-%package -n geronimo-j2ee-1.4-apis
+%package -n geronimo-j2ee-1_4-apis
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
 Requires:       %{name}-poms = %{version}-%{release}
 
-%description -n geronimo-j2ee-1.4-apis
+%description -n geronimo-j2ee-1_4-apis
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: J2EE Specification (the complete set in one jar)
 
 
 
-%package -n geronimo-j2ee-connector-1.5-api
+%package -n geronimo-j2ee-connector-1_5-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -232,13 +235,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-j2ee-connector-1.5-api
+%description -n geronimo-j2ee-connector-1_5-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: J2EE Connector Architecture Specification
 
 
 
-%package -n geronimo-j2ee-deployment-1.1-api
+%package -n geronimo-j2ee-deployment-1_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -248,13 +251,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-j2ee-deployment-1.1-api
+%description -n geronimo-j2ee-deployment-1_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: J2EE Application Deployment Specification
 
 
 
-%package -n geronimo-jacc-1.0-api
+%package -n geronimo-jacc-1_0-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -264,14 +267,14 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jacc-1.0-api
+%description -n geronimo-jacc-1_0-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Java Authorization Contract for Containers
 Specification
 
 
 
-%package -n geronimo-j2ee-management-1.0-api
+%package -n geronimo-j2ee-management-1_0-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -281,13 +284,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-j2ee-management-1.0-api
+%description -n geronimo-j2ee-management-1_0-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: J2EE Application Management Specification
 
 
 
-%package -n geronimo-javamail-1.3.1-api
+%package -n geronimo-javamail-1_3_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -297,13 +300,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 # all in a single jar file called 'javamail.jar'
 #Provides:    javamail = 0:1.3.1
 
-%description -n geronimo-javamail-1.3.1-api
+%description -n geronimo-javamail-1_3_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: JavaMail API
 
 
 
-%package -n geronimo-jaxr-1.0-api
+%package -n geronimo-jaxr-1_0-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -314,13 +317,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jaxr-1.0-api
+%description -n geronimo-jaxr-1_0-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Java API for XML Registries (JAXR)
 
 
 
-%package -n geronimo-jaxrpc-1.1-api
+%package -n geronimo-jaxrpc-1_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -329,13 +332,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jaxrpc-1.1-api
+%description -n geronimo-jaxrpc-1_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Java API for XML-Based RPC (JAXRPC)
 
 
 
-%package -n geronimo-jms-1.1-api
+%package -n geronimo-jms-1_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -345,13 +348,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jms-1.1-api
+%description -n geronimo-jms-1_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: JMS Specification
 
 
 
-%package -n geronimo-jsp-2.0-api
+%package -n geronimo-jsp-2_0-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -360,13 +363,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jsp-2.0-api
+%description -n geronimo-jsp-2_0-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: JavaServer Pages Specification
 
 
 
-%package -n geronimo-jta-1.0.1B-api
+%package -n geronimo-jta-1_0_1B-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -377,13 +380,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-jta-1.0.1B-api
+%description -n geronimo-jta-1_0_1B-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: Java Transaction API Specification
 
 
 
-%package -n geronimo-qname-1.1-api
+%package -n geronimo-qname-1_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -391,13 +394,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-qname-1.1-api
+%description -n geronimo-qname-1_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: javax.xml.namespace.QName API
 
 
 
-%package -n geronimo-saaj-1.1-api
+%package -n geronimo-saaj-1_1-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -406,13 +409,13 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-saaj-1.1-api
+%description -n geronimo-saaj-1_1-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: SOAP with Attachments API for Java (SAAJ)
 
 
 
-%package -n geronimo-servlet-2.4-api
+%package -n geronimo-servlet-2_4-api
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
@@ -421,7 +424,7 @@ Requires:       %{name}-poms = %{version}-%{release}
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
 
-%description -n geronimo-servlet-2.4-api
+%description -n geronimo-servlet-2_4-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
 J2EE-Specifications: J2EE Servlet v2.4 API
 
@@ -431,6 +434,9 @@ J2EE-Specifications: J2EE Servlet v2.4 API
 License:        The Apache Software License
 Summary:        Geronimo J2EE server J2EE specifications
 Group:          Development/Languages/Java
+%if %defined suse_version
+PreReq:         coreutils
+%endif
 Requires(post):   jpackage-utils >= 1.7.3
 Requires(postun): jpackage-utils >= 1.7.3
 
@@ -600,7 +606,9 @@ popd
 %endif
 
 %install
+%if ! %defined suse_version 
 rm -rf $RPM_BUILD_ROOT
+%endif
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 # Directory for poms
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -897,13 +905,13 @@ rm -rf $RPM_BUILD_ROOT
 %postun poms
 %update_maven_depmap
 
-%triggerpostun -n geronimo-jaf-1.0.2-api -- classpathx-jaf <= 1.0-2jpp_4rh
+%triggerpostun -n geronimo-jaf-1_0_2-api -- classpathx-jaf <= 1.0-2jpp_4rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/jaf.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/jaf %{_javadir}/jaf.jar
 
-%post -n geronimo-jaf-1.0.2-api
+%post -n geronimo-jaf-1_0_2-api
 /usr/sbin/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -912,13 +920,13 @@ then
 fi
 %endif
 
-%preun -n geronimo-jaf-1.0.2-api
+%preun -n geronimo-jaf-1_0_2-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jaf-1.0.2-api
+%postun -n geronimo-jaf-1_0_2-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -926,7 +934,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%post -n geronimo-commonj-1.1-apis
+%post -n geronimo-commonj-1_1-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -934,7 +942,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%postun -n geronimo-commonj-1.1-apis
+%postun -n geronimo-commonj-1_1-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -942,7 +950,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%post -n geronimo-corba-1.0-apis
+%post -n geronimo-corba-1_0-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -950,7 +958,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%postun -n geronimo-corba-1.0-apis
+%postun -n geronimo-corba-1_0-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -958,7 +966,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%post -n geronimo-corba-2.3-apis
+%post -n geronimo-corba-2_3-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -966,7 +974,7 @@ fi
 %endif
 %if %{gcj_support}
 
-%postun -n geronimo-corba-2.3-apis
+%postun -n geronimo-corba-2_3-apis
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -988,13 +996,13 @@ fi
 #fi
 #%endif
 
-%triggerpostun -n geronimo-ejb-2.1-api -- ejb <= 2.1-3jpp_2rh
+%triggerpostun -n geronimo-ejb-2_1-api -- ejb <= 2.1-3jpp_2rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/ejb.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/ejb %{_javadir}/ejb.jar
 
-%post -n geronimo-ejb-2.1-api
+%post -n geronimo-ejb-2_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-2.1-api.jar 20100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1003,26 +1011,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-ejb-2.1-api
+%preun -n geronimo-ejb-2_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove ejb %{_javadir}/geronimo-ejb-2.1-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-ejb-2.1-api
+%postun -n geronimo-ejb-2_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-j2ee-connector-1.5-api -- j2ee-connector <= 1.5-3jpp_2rh
+%triggerpostun -n geronimo-j2ee-connector-1_5-api -- j2ee-connector <= 1.5-3jpp_2rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/j2ee-connector.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/j2ee-connector %{_javadir}/j2ee-connector.jar
 
-%post -n geronimo-j2ee-connector-1.5-api
+%post -n geronimo-j2ee-connector-1_5-api
 /usr/sbin/update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1031,26 +1039,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-j2ee-connector-1.5-api
+%preun -n geronimo-j2ee-connector-1_5-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-j2ee-connector-1.5-api
+%postun -n geronimo-j2ee-connector-1_5-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-j2ee-deployment-1.1-api -- j2ee-deployment <= 1.1-1jpp_1rh
+%triggerpostun -n geronimo-j2ee-deployment-1_1-api -- j2ee-deployment <= 1.1-1jpp_1rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/j2ee-deployment.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/j2ee-deployment %{_javadir}/j2ee-deployment.jar
 
-%post -n geronimo-j2ee-deployment-1.1-api
+%post -n geronimo-j2ee-deployment-1_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/j2ee-deployment.jar j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1059,26 +1067,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-j2ee-deployment-1.1-api
+%preun -n geronimo-j2ee-deployment-1_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-j2ee-deployment-1.1-api
+%postun -n geronimo-j2ee-deployment-1_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-jacc-1.0-api -- jacc <= 1.0-1jpp
+%triggerpostun -n geronimo-jacc-1_0-api -- jacc <= 1.0-1jpp
 # Remove file from old non-free packages
 rm -f %{_javadir}/jacc.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/jacc %{_javadir}/jacc.jar
 
-%post -n geronimo-jacc-1.0-api
+%post -n geronimo-jacc-1_0-api
 /usr/sbin/update-alternatives --install %{_javadir}/jacc.jar jacc %{_javadir}/geronimo-jacc-1.0-api.jar 10000
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1087,26 +1095,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-jacc-1.0-api
+%preun -n geronimo-jacc-1_0-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jacc %{_javadir}/geronimo-jacc-1.0-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jacc-1.0-api
+%postun -n geronimo-jacc-1_0-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-j2ee-management-1.0-api -- j2ee-management <= 1.0-1jpp_1rh
+%triggerpostun -n geronimo-j2ee-management-1_0-api -- j2ee-management <= 1.0-1jpp_1rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/j2ee-management.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/j2ee-management %{_javadir}/j2ee-management.jar
 
-%post -n geronimo-j2ee-management-1.0-api
+%post -n geronimo-j2ee-management-1_0-api
 /usr/sbin/update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1115,13 +1123,13 @@ then
 fi
 %endif
 
-%preun -n geronimo-j2ee-management-1.0-api
+%preun -n geronimo-j2ee-management-1_0-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-j2ee-management-1.0-api
+%postun -n geronimo-j2ee-management-1_0-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -1132,7 +1140,7 @@ fi
 # all in a single jar file called 'javamail.jar'
 %if %{gcj_support}
 
-%post -n geronimo-javamail-1.3.1-api
+%post -n geronimo-javamail-1_3_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -1146,20 +1154,20 @@ fi
 #fi
 %if %{gcj_support}
 
-%postun -n geronimo-javamail-1.3.1-api
+%postun -n geronimo-javamail-1_3_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-jaxr-1.0-api -- jaxr-api <= 1.0-1jpp
+%triggerpostun -n geronimo-jaxr-1_0-api -- jaxr-api <= 1.0-1jpp
 # Remove file from old non-free packages
 rm -f %{_javadir}/jaxr.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/jaxr %{_javadir}/jaxr.jar
 
-%post -n geronimo-jaxr-1.0-api
+%post -n geronimo-jaxr-1_0-api
 /usr/sbin/update-alternatives --install %{_javadir}/jaxr.jar jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar 10000
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1168,20 +1176,20 @@ then
 fi
 %endif
 
-%preun -n geronimo-jaxr-1.0-api
+%preun -n geronimo-jaxr-1_0-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jaxr-1.0-api
+%postun -n geronimo-jaxr-1_0-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%post -n geronimo-jaxrpc-1.1-api
+%post -n geronimo-jaxrpc-1_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/jaxrpc.jar jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1190,26 +1198,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-jaxrpc-1.1-api
+%preun -n geronimo-jaxrpc-1_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jaxrpc-1.1-api
+%postun -n geronimo-jaxrpc-1_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-jms-1.1-api -- jms <= 1.1-3jpp_2rh
+%triggerpostun -n geronimo-jms-1_1-api -- jms <= 1.1-3jpp_2rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/jms.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/jms %{_javadir}/jms.jar
 
-%post -n geronimo-jms-1.1-api
+%post -n geronimo-jms-1_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/jms.jar jms %{_javadir}/geronimo-jms-1.1-api.jar 10100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1218,20 +1226,20 @@ then
 fi
 %endif
 
-%preun -n geronimo-jms-1.1-api
+%preun -n geronimo-jms-1_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jms-1.1-api
+%postun -n geronimo-jms-1_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%post -n geronimo-jsp-2.0-api
+%post -n geronimo-jsp-2_0-api
 /usr/sbin/update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.0-api.jar 20000
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1240,26 +1248,26 @@ then
 fi
 %endif
 
-%preun -n geronimo-jsp-2.0-api
+%preun -n geronimo-jsp-2_0-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.0-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jsp-2.0-api
+%postun -n geronimo-jsp-2_0-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%triggerpostun -n geronimo-jta-1.0.1B-api -- jta <= 1.0.1-0.b.3jpp_2rh
+%triggerpostun -n geronimo-jta-1_0_1B-api -- jta <= 1.0.1-0.b.3jpp_2rh
 # Remove file from old non-free packages
 rm -f %{_javadir}/jta.jar
 # Recreate the link as update-alternatives could not do it
 ln -s %{_sysconfdir}/alternatives/jta %{_javadir}/jta.jar
 
-%post -n geronimo-jta-1.0.1B-api
+%post -n geronimo-jta-1_0_1B-api
 /usr/sbin/update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1268,20 +1276,20 @@ then
 fi
 %endif
 
-%preun -n geronimo-jta-1.0.1B-api
+%preun -n geronimo-jta-1_0_1B-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-jta-1.0.1B-api
+%postun -n geronimo-jta-1_0_1B-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%post -n geronimo-qname-1.1-api
+%post -n geronimo-qname-1_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/qname.jar qname %{_javadir}/geronimo-qname-1.1-api.jar 10100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1290,7 +1298,7 @@ then
 fi
 %endif
 
-%postun -n geronimo-qname-1.1-api
+%postun -n geronimo-qname-1_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove qname %{_javadir}/geronimo-qname-1.1-api.jar
 fi
@@ -1301,7 +1309,7 @@ then
 fi
 %endif
 
-%post -n geronimo-saaj-1.1-api
+%post -n geronimo-saaj-1_1-api
 /usr/sbin/update-alternatives --install %{_javadir}/saaj.jar saaj %{_javadir}/geronimo-saaj-1.1-api.jar 10100
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1310,20 +1318,20 @@ then
 fi
 %endif
 
-%preun -n geronimo-saaj-1.1-api
+%preun -n geronimo-saaj-1_1-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove saaj %{_javadir}/geronimo-saaj-1.1-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-saaj-1.1-api
+%postun -n geronimo-saaj-1_1-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%post -n geronimo-servlet-2.4-api
+%post -n geronimo-servlet-2_4-api
 /usr/sbin/update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.4-api.jar 20400
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1332,13 +1340,13 @@ then
 fi
 %endif
 
-%preun -n geronimo-servlet-2.4-api
+%preun -n geronimo-servlet-2_4-api
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.4-api.jar
 fi
 %if %{gcj_support}
 
-%postun -n geronimo-servlet-2.4-api
+%postun -n geronimo-servlet-2_4-api
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -1366,7 +1374,7 @@ fi
 %dir %{_datadir}/maven2
 %{_datadir}/maven2/poms
 
-%files -n geronimo-commonj-1.1-apis
+%files -n geronimo-commonj-1_1-apis
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-commonj-1.1-apis*.jar
 %doc geronimo-spec-commonj/LICENSE.txt
@@ -1375,7 +1383,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-commonj-1.1-apis-%{version}.jar.*
 %endif
 
-%files -n geronimo-jaf-1.0.2-api
+%files -n geronimo-jaf-1_0_2-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jaf-1.0.2-api*.jar
 %doc geronimo-spec-activation/LICENSE.txt
@@ -1385,7 +1393,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaf-1.0.2-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-corba-1.0-apis
+%files -n geronimo-corba-1_0-apis
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-corba-1.0-apis*.jar
 #%doc geronimo-spec-corba/LICENSE.txt
@@ -1394,7 +1402,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-1.0-apis-%{version}.jar.*
 %endif
 
-%files -n geronimo-corba-2.3-apis
+%files -n geronimo-corba-2_3-apis
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-corba-2.3-apis*.jar
 %doc geronimo-spec-corba-2.3/LICENSE.txt
@@ -1411,7 +1419,7 @@ fi
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-3.0-apis-%{version}.jar.*
 #%endif
 
-%files -n geronimo-ejb-2.1-api
+%files -n geronimo-ejb-2_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-ejb-2.1-api*.jar
 %doc geronimo-spec-ejb/LICENSE.txt
@@ -1421,7 +1429,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-ejb-2.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-j2ee-1.4-apis
+%files -n geronimo-j2ee-1_4-apis
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-j2ee-1.4-apis*.jar
 %doc geronimo-spec-j2ee/LICENSE.txt
@@ -1430,7 +1438,7 @@ fi
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-1.4-apis-%{version}.jar.*
 #%endif
 
-%files -n geronimo-j2ee-connector-1.5-api
+%files -n geronimo-j2ee-connector-1_5-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-j2ee-connector-1.5-api*.jar
 %doc geronimo-spec-j2ee-connector/LICENSE.txt
@@ -1440,7 +1448,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-connector-1.5-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-j2ee-deployment-1.1-api
+%files -n geronimo-j2ee-deployment-1_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-j2ee-deployment-1.1-api*.jar
 %doc geronimo-spec-j2ee-deployment/LICENSE.txt
@@ -1450,7 +1458,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-deployment-1.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jacc-1.0-api
+%files -n geronimo-jacc-1_0-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jacc-1.0-api*.jar
 %doc geronimo-spec-j2ee-jacc/LICENSE.txt
@@ -1460,7 +1468,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jacc-1.0-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-j2ee-management-1.0-api
+%files -n geronimo-j2ee-management-1_0-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-j2ee-management-1.0-api*.jar
 %doc geronimo-spec-j2ee-management/LICENSE.txt
@@ -1470,7 +1478,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-management-1.0-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-javamail-1.3.1-api
+%files -n geronimo-javamail-1_3_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-javamail-1.3.1-api*.jar
 %doc geronimo-spec-javamail/LICENSE.txt
@@ -1483,7 +1491,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-javamail-1.3.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jaxr-1.0-api
+%files -n geronimo-jaxr-1_0-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jaxr-1.0-api*.jar
 %doc geronimo-spec-jaxr/LICENSE.txt
@@ -1493,7 +1501,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaxr-1.0-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jaxrpc-1.1-api
+%files -n geronimo-jaxrpc-1_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jaxrpc-1.1-api*.jar
 %doc geronimo-spec-jaxrpc/LICENSE.txt
@@ -1503,7 +1511,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaxrpc-1.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jms-1.1-api
+%files -n geronimo-jms-1_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jms-1.1-api*.jar
 %doc geronimo-spec-jms/LICENSE.txt
@@ -1513,7 +1521,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jms-1.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jsp-2.0-api
+%files -n geronimo-jsp-2_0-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jsp-2.0-api*.jar
 %doc geronimo-spec-jsp/LICENSE.txt
@@ -1523,7 +1531,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jsp-2.0-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-jta-1.0.1B-api
+%files -n geronimo-jta-1_0_1B-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-jta-1.0.1B-api*.jar
 %doc geronimo-spec-jta/LICENSE.txt
@@ -1533,7 +1541,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jta-1.0.1B-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-qname-1.1-api
+%files -n geronimo-qname-1_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-qname-1.1-api*.jar
 %doc geronimo-spec-qname/LICENSE.txt
@@ -1543,7 +1551,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-qname-1.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-saaj-1.1-api
+%files -n geronimo-saaj-1_1-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-saaj-1.1-api*.jar
 %doc geronimo-spec-saaj/LICENSE.txt
@@ -1553,7 +1561,7 @@ fi
 %attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-saaj-1.1-api-%{version}.jar.*
 %endif
 
-%files -n geronimo-servlet-2.4-api
+%files -n geronimo-servlet-2_4-api
 %defattr(-,root,root,-)
 %{_javadir}/geronimo-servlet-2.4-api*.jar
 %doc geronimo-spec-servlet/LICENSE.txt
@@ -1564,6 +1572,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 17 2008 mvyskocil@suse.cz
+- Dots in names was replaced by underscore
+- Added a PreReq on coreutils
+- Removed of BuildRoot removal in %%install phase
 * Mon Apr 07 2008 mvyskocil@suse.cz
 - First release in Suse (JPP 1.7) version 1.1
   - build dependency for log4j update [bnc#355798]