[aries-proxy] Upstream release 1.0.0

[Marek Goldmann]

commit b9a4f6346dfed13889818e3ee404791084e90743
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jun 18 08:39:04 2013 +0200

    Upstream release 1.0.0
    
    Additionally the new guidelines were applied.

 .gitignore       |    4 ++
 aries-proxy.spec |  109 ++++++++++++++++++++++-------------------------------
 sources          |    5 ++-
 3 files changed, 53 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cf9670..9730e8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /aries-proxy-0.3.tar.xz
+/org.apache.aries.proxy-1.0.0-source-release.zip
+/org.apache.aries.proxy.api-1.0.0-source-release.zip
+/org.apache.aries.proxy.impl-1.0.0-source-release.zip
+/org.apache.aries.proxy.itests-1.0.0-source-release.zip
diff --git a/aries-proxy.spec b/aries-proxy.spec
index 7807836..47a0058 100644
--- a/aries-proxy.spec
+++ b/aries-proxy.spec
@@ -1,42 +1,27 @@
-Name:          aries-proxy
-Version:       0.3
-Release:       4%{?dist}
-Summary:       Apache Aries Class Proxy
-License:       ASL 2.0
-Group:         Development/Libraries
-URL:           http://aries.apache.org/
-
-# svn export http://svn.apache.org/repos/asf/aries/tags/proxy-0.3/ aries-proxy-0.3
-# tar cafJ aries-proxy-0.3.tar.xz aries-proxy-0.3
-
-Source0:       %{name}-%{version}.tar.xz
-Patch0:        %{name}-%{version}-xml.patch
+Name:           aries-proxy
+Version:        1.0.0
+Release:        1%{?dist}
+Summary:        Apache Aries Class Proxy
+License:        ASL 2.0
+URL:            http://aries.apache.org/
+
+Source0:        http://archive.apache.org/dist/aries/org.apache.aries.proxy-1.0.0-source-release.zip
+Source1:        http://archive.apache.org/dist/aries/org.apache.aries.proxy.api-1.0.0-source-release.zip
+Source2:        http://archive.apache.org/dist/aries/org.apache.aries.proxy.impl-1.0.0-source-release.zip
+Source3:        http://archive.apache.org/dist/aries/org.apache.aries.proxy.itests-1.0.0-source-release.zip
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: aries-util
-BuildRequires: asm2
+BuildRequires: objectweb-asm4
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: slf4j
-
-Requires:      java
-Requires:      jpackage-utils
-Requires:      aries-util
-Requires:      asm2
-Requires:      felix-osgi-compendium
-Requires:      felix-osgi-core
-Requires:      slf4j
+BuildRequires: unzip
 
 %description
 A common proxy class generation service that can be used by
@@ -44,59 +29,55 @@ blueprint and jndi and others.
 
 %package javadoc
 Summary:       Javadocs for %{name}
-Group:         Documentation
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%setup -n org.apache.aries.proxy-%{version}
 
-%build
-# test failures in ProxySubclassGeneratorTest
-mvn-rpmbuild \
-  -Dmaven.test.skip=true \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  package javadoc:aggregate
+unzip %{SOURCE1}
+unzip %{SOURCE2}
+# Not used now
+# unzip %{SOURCE3}
 
-%install
+mv org.apache.aries.proxy.api-%{version} api
+mv org.apache.aries.proxy.impl-%{version} impl
 
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+%pom_remove_parent
+%pom_remove_parent api
+%pom_remove_parent impl
 
-# modules
-for module in api impl;
-do
-  pushd proxy-$module
-  jarname=org.apache.aries.proxy.$module
-  install -pm 644 target/$jarname-%{version}.jar %{buildroot}%{_javadir}/%{name}/$jarname.jar
-  install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$jarname.pom
-  %add_maven_depmap JPP.%{name}-$jarname.pom %{name}/$jarname.jar
-  popd
-done
+%pom_xpath_inject pom:project "<modules><module>api</module><module>impl</module></modules>"
 
-# pom
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
+# hange the packaging type
+sed -i "s|>bundle<|>pom<|" pom.xml
+sed -i "s|>bundle<|>jar<|" api/pom.xml
+sed -i "s|>bundle<|>jar<|" impl/pom.xml
 
-# depmap
-%add_maven_depmap JPP.%{name}.pom
+# No OSGI v5
+rm -rf api/src/main/java/org/apache/aries/proxy/weavinghook
+rm -rf impl/src/main/java/org/apache/aries/proxy/impl/weaving
 
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%build
+%mvn_build -f
 
+%install
+%mvn_install
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc LICENSE
+%doc NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE
 
 %changelog
+* Fri Jun 14 2013 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-1
+- Upstream release 1.0.0
+- New guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index f423799..8f531c9 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-5e997114d773be0269c0122f962fc09f  aries-proxy-0.3.tar.xz
+2f24b0b28b680246e7e705c9160f3866  org.apache.aries.proxy-1.0.0-source-release.zip
+ccef34b6282f12b41c89f39c744a3807  org.apache.aries.proxy.api-1.0.0-source-release.zip
+536f192a5fb71c280e881f198b12aeec  org.apache.aries.proxy.impl-1.0.0-source-release.zip
+ddb4d730a72b69b6da211659e40908d7  org.apache.aries.proxy.itests-1.0.0-source-release.zip