From c522ede61e52f59f3d541d84cd9def1b159fada818ca1793fae086dcc8f6c3f8 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Mon, 19 Sep 2011 15:14:38 +0000 Subject: [PATCH] Accepting request 83565 from Java:packages - fix a typo in alternatives --install call causing a build failure OBS-URL: https://build.opensuse.org/request/show/83565 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geronimo-specs?expand=0&rev=13 --- geronimo-specs.changes | 5 ++++ geronimo-specs.spec | 58 +++--------------------------------------- 2 files changed, 8 insertions(+), 55 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 2ec6c4c..3dab4a4 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 19 12:35:44 UTC 2011 - mvyskocil@suse.cz + +- fix a typo in alternatives --install call causing a build failure + ------------------------------------------------------------------- Wed May 6 16:19:03 CEST 2009 - mvyskocil@suse.cz diff --git a/geronimo-specs.spec b/geronimo-specs.spec index e040266..03dda69 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1,7 +1,7 @@ # -# spec file for package geronimo-specs (Version 1.2) +# spec file for package geronimo-specs # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -2305,7 +2305,7 @@ fi %{_sbindir}/update-alternatives --install %{_javadir}/ejb_2_1_api.jar ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20100 %{_sbindir}/update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 %{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_api.jar j2ee_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_1_5_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 +%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 %{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_api.jar j2ee_deployment_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 %{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_1_1_api.jar j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 %{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 @@ -2725,55 +2725,3 @@ fi %ghost %{_javadir}/ws_metadata_2_0_api.jar %changelog -* Wed May 06 2009 mvyskocil@suse.cz -- Update to 1.2 - * bugfix release and update release - * JPA support. - * CA - Certificate Authority capabilities, you can now issue certificates in - reply to CSRs. See http://cwiki.apache.org/GMOxDOC12/certification-authority.html -- synchronized specfile with jpackage 5.0 - * mavenized - * obsoleted geronimo-specs-j2ee-management-pom.patch, - geronimo-specs-pom_xml.patch, geronimo-spec-javamail-sun-security.patch - * do not use triggers - * use alternatives system -- used one build.xml for all packages ==> shorter %%build section -- fdupes used on javadoc -- new packages - * geronimo-ws-metadata - * geronimo-stax-1_0-api - * geronimo-servlet-2_5 - * geronimo-jta-1_1-api - * geronimo-jsp-2_1-api - * geronimo-jpa-3_0-api - * geronimo-javamail-1_4-api - * geronimo-j2ee-management-1_1 - * geronimo-jacc-1_1-api - * geronimo-javaee-deployment - * geronimo-interceptor-3_0-api - * geronimo-el-1_0-api - * geronimo-ejb-3_0-api - * geronimo-annotation-1_0-api - * geronimo-jaf-1_1-api - * geronimo-specs-javadoc -- undot.py to remove dots from package names -- remove %%{release} from Requires -* Mon Dec 01 2008 mvyskocil@suse.cz -- added a Conflicts to gnu-jaf to geronimo-jav-1_0_2-api -* Tue Aug 26 2008 anosek@suse.cz -- fixed path to LICENSE.txt files in spec -* Mon Aug 25 2008 mvyskocil@suse.cz -- target=1.5 source=1.5 -- removed a gcj support -- fixed some rpmlint warnings -* Tue Apr 22 2008 ro@suse.de -- changed requires of main package to use underscores as well -* 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] - - added a build support using ant - - FIXME: the corba-3.0 package is not currently included