From fe79a1b90eaa9108f89f946ae3a037d5817ee3f8 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Tue, 13 Oct 2015 19:28:53 +0200 Subject: [PATCH] 2015-10-13: Retired because of broken deps in preparation of Fedora 23 Reference: https://fedorahosted.org/rel-eng/ticket/6260 --- .gitignore | 1 - 0001-Change-guid-aid-of-deps.patch | 55 ------------ apache-scout.spec | 131 ----------------------------- dead.package | 3 + sources | 1 - 5 files changed, 3 insertions(+), 188 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Change-guid-aid-of-deps.patch delete mode 100644 apache-scout.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1445c37..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/apache-scout-1.2.6.tar.xz diff --git a/0001-Change-guid-aid-of-deps.patch b/0001-Change-guid-aid-of-deps.patch deleted file mode 100644 index 605f77b..0000000 --- a/0001-Change-guid-aid-of-deps.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c921befc4b9d6bd8a535a42f8e4c4bfe0f7fc55e Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Fri, 11 May 2012 08:59:25 +0200 -Subject: [PATCH] Change guid:aid of deps - ---- - pom.xml | 23 +++++++++-------------- - 1 file changed, 9 insertions(+), 14 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 11c7047..4713f6c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -137,19 +137,14 @@ - - - -- org.apache.geronimo.specs -- geronimo-activation_1.1_spec -- 1.0.2 -- -- -- org.apache.geronimo.specs -- geronimo-jaxb_2.1_spec -- 1.0 -+ org.jboss.spec.javax.xml.bind -+ jboss-jaxb-api_2.2_spec -+ 1.0.4.Final - - -- org.apache.geronimo.specs -- geronimo-jaxr_1.0_spec -- 2.0.0 -+ org.jboss.spec.javax.xml.registry -+ jboss-jaxr-api_1.0_spec -+ 1.0.2.Final - - - org.apache.geronimo.specs -@@ -163,9 +158,9 @@ - 1.0.1 - - -- org.apache.geronimo.specs -- geronimo-stax-api_1.0_spec -- 1.0.1 -+ org.codehaus.woodstox -+ stax2-api -+ 3.1.1 - - - --- -1.7.10.1 - diff --git a/apache-scout.spec b/apache-scout.spec deleted file mode 100644 index 6f06631..0000000 --- a/apache-scout.spec +++ /dev/null @@ -1,131 +0,0 @@ -Name: apache-scout -Version: 1.2.6 -Release: 12%{?dist} -Summary: JSR 93 (JAXR) implementation -License: ASL 2.0 -URL: http://juddi.apache.org/scout -# svn export http://svn.apache.org/repos/asf/juddi/scout/tags/scout-1.2.6/ apache-scout -# tar cafJ apache-scout-1.2.6.tar.xz apache-scout -Source0: %{name}-%{version}.tar.xz - -BuildArch: noarch - -BuildRequires: java-devel -BuildRequires: maven-local - -BuildRequires: axis -BuildRequires: mvn(axis:axis) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec) -BuildRequires: mvn(org.apache.juddi:juddi-client) -BuildRequires: mvn(org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec) -BuildRequires: mvn(org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec) -BuildRequires: geronimo-parent-poms -BuildRequires: mvn(org.aspectj:aspectjweaver) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-saaj_1.3_spec) -BuildRequires: wsdl4j - - -%if 0 -# test deps -BuildRequires: mvn(axis:axis-jaxrpc) -BuildRequires: mvn(axis:axis-saaj) -BuildRequires: mvn(commons-discovery:commons-discovery) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j) -BuildRequires: mvn(org.apache.derby:derby) -BuildRequires: mvn(org.apache.juddi:juddi:2.0.1) -BuildRequires: mvn(org.aspectj:aspectjrt) -BuildRequires: mvn(org.aspectj:aspectjweaver) -%endif - -%description -Apache Scout is an implementation of the JSR 93 Java API For XML Registries -(JAXR). It provides an implementation to access UDDI registries (particularly -Apache jUDDI) in a standard way. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -n %{name} - -%pom_remove_dep :geronimo-activation_1.1_spec -%pom_remove_dep :geronimo-jaxb_2.1_spec -%pom_add_dep org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:1.0.4.Final -%pom_remove_dep :geronimo-jaxr_1.0_spec -%pom_add_dep org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:1.0.2.Final -%pom_remove_dep :geronimo-stax-api_1.0_spec -%pom_add_dep org.codehaus.woodstox:stax2-api:3.1.1 - -# fedora aspectjweaver package provides aspectjrt -%pom_remove_dep org.aspectj:aspectjrt -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'aspectjweaver' ]/pom:groupId" org.aspectj - -sed -i 's/\r//' README - -# build fix for apache juddi 3.1.5 -sed -i "s|UDDIClerkManager|UDDIClient|" \ - src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java - -%build - -%mvn_file :scout %{name} -# Skipped because of many test resources not packaged -%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 - -%install -%mvn_install - -%files -f .mfiles -%doc LICENSE NOTICE README - -%files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE - -%changelog -* Wed Jun 17 2015 Fedora Release Engineering - 1.2.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 08 2014 Michael Simacek - 1.2.6-10 -- Add missing BR geronimo-saaj - -* Fri Mar 28 2014 Michael Simacek - 1.2.6-9 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Aug 08 2013 gil cattaneo 1.2.6-8 -- fix rhbz#991978 -- build fix for apache juddi >= 3.1.5 -- switch to XMvn -- resolve some rpmlint problems -- install NOTICE file in javadoc sub package -- use pom macros -- minor changes to adapt to current guideline - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Marek Goldmann - 1.2.6-6 -- Added geronimo-parent-poms BR to fix the build - -* Wed Feb 13 2013 Fedora Release Engineering - 1.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.2.6-4 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jul 18 2012 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Marek Goldmann 1.2.6-2 -- Changed description - -* Thu May 17 2012 Marek Goldmann 1.2.6-1 -- Initial packaging - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7002ef9 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2015-10-13: Retired because of broken deps in preparation of Fedora 23 +Reference: https://fedorahosted.org/rel-eng/ticket/6260 + diff --git a/sources b/sources deleted file mode 100644 index cac44c6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -2dc64341ad53f00d0be2655a1b1921d0 apache-scout-1.2.6.tar.xz