Attachment 621857 Details for Bug 863279 – Added sub package extensions

[patch] Added sub package extensions

0001-Added-sub-package-extensions.patch (text/plain), 5.09 KB, created by gil cattaneo on 2012-10-04 23:54:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-04 23:54:55 UTC

Size: 5.09 KB

patch

obsolete

>From 9fff6f0c26355c611ad82196b91d67e17b8c82df Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 5 Oct 2012 01:53:55 +0200
>Subject: [PATCH] Added sub package extensions
>
>---
> google-guice.spec |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++--
> 1 files changed, 101 insertions(+), 3 deletions(-)
>
>diff --git a/google-guice.spec b/google-guice.spec
>index c9998ae..141f4fe 100644
>--- a/google-guice.spec
>+++ b/google-guice.spec
>@@ -2,7 +2,7 @@
> 
> Name:           google-%{short_name}
> Version:        3.0
>-Release:        0.7.rc2%{?dist}
>+Release:        0.8.rc2%{?dist}
> Summary:        Lightweight dependency injection framework
> 
> 
>@@ -36,6 +36,13 @@ BuildRequires:  zip
> BuildRequires:  slf4j
> BuildRequires:  jpackage-utils
> 
>+# extensions BR/R
>+BuildRequires:  aopalliance
>+BuildRequires:  hibernate-jpa-2.0-api
>+BuildRequires:  springframework
>+BuildRequires:  springframework-beans
>+BuildRequires:  tomcat-servlet-3.0-api
>+
> Requires:       cglib
> Requires:       atinject
> Requires:       java >= 1:1.6.0
>@@ -70,6 +77,19 @@ Requires:       jpackage-utils
> %description    javadoc
> %{summary}.
> 
>+%package        extensions
>+Summary:        Google Guice - Extensions
>+Group:          Development/Tools
>+Requires:       %{name} = %{version}-%{release}
>+Requires:       aopalliance
>+Requires:       hibernate-jpa-2.0-api
>+Requires:       springframework
>+Requires:       springframework-beans
>+Requires:       tomcat-servlet-3.0-api
>+
>+%description    extensions
>+%{summary}.
>+
> %prep
> %setup -q -n %{short_name}-%{version}-rc2-src
> %patch0
>@@ -113,6 +133,26 @@ popd
> rm -rf munge-repack
> #end munge.jar repack
> 
>+mkdir -p build/no_aop/extensions/persist/lib/build
>+pushd build/no_aop/extensions/persist/lib
>+build-jar-repository -s -p . hibernate-jpa-2.0-api tomcat-servlet-3.0-api aopalliance
>+popd
>+
>+mkdir -p build/no_aop/extensions/servlet/lib/build
>+pushd build/no_aop/extensions/servlet/lib
>+build-jar-repository -s -p . tomcat-servlet-3.0-api
>+popd
>+
>+mkdir -p build/no_aop/lib/
>+pushd build/no_aop/lib
>+build-jar-repository -s -p . springframework/spring-beans springframework/spring-core
>+popd
>+
>+%pom_remove_dep org.easymock:easymock extensions/grapher
>+%pom_remove_dep org.easymock:easymock extensions/servlet
>+%pom_remove_dep org.hsqldb:hsqldb-j5 extensions/persist
>+
>+
> %build
> # create no-aop build environment
> ant no_aop
>@@ -124,6 +164,24 @@ mkdir -p servlet/lib/build
> ant -Dversion=%{version} jar
> popd
> 
>+ln -sf $PWD/build/no_aop/build/dist/%{short_name}-%{version}.jar lib/
>+# struts2
>+for e in assistedinject \
>+  grapher \
>+  jmx \
>+  jndi \
>+  multibindings \
>+  persist \
>+  servlet \
>+  spring \
>+  throwingproviders; do
>+  pushd build/no_aop/extensions/$e
>+    sed -i 's|<?xml version="1.0" encoding="UTF-8"?>||' pom.xml
>+%pom_remove_parent
>+    ant -Dversion=%{version}
>+  popd
>+done
>+
> %install
> install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
> pushd build/no_aop
>@@ -137,6 +195,24 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-parent.pom
> install -pm 644 core/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
> # provide sisu group/artifact (should be just mavenized google-guice
> %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.sonatype.sisu:sisu-guice"
>+
>+
>+  pushd extensions
>+# struts2
>+    for m in assistedinject \
>+        grapher \
>+        jmx \
>+        jndi \
>+        multibindings \
>+        persist \
>+        servlet \
>+        spring \
>+        throwingproviders; do
>+      install -m 644 ${m}/build/%{short_name}-${m}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}-${m}.jar
>+      install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-${m}.pom
>+%add_maven_depmap JPP-%{short_name}-${m}.pom %{short_name}-${m}.jar -f extensions
>+    done
>+  popd
> popd
> 
> # javadoc
>@@ -157,14 +233,36 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> %{_mavenpomdir}/JPP-%{name}.pom
> %{_mavendepmapfragdir}/%{name}
> 
>+%files extensions
>+%doc COPYING
>+%{_javadir}/%{short_name}-assistedinject.jar
>+%{_javadir}/%{short_name}-grapher.jar
>+%{_javadir}/%{short_name}-jmx.jar
>+%{_javadir}/%{short_name}-jndi.jar
>+%{_javadir}/%{short_name}-multibindings.jar
>+%{_javadir}/%{short_name}-persist.jar
>+%{_javadir}/%{short_name}-servlet.jar
>+%{_javadir}/%{short_name}-spring.jar
>+%{_javadir}/%{short_name}-throwingproviders.jar
>+%{_mavenpomdir}/JPP-%{short_name}-assistedinject.pom
>+%{_mavenpomdir}/JPP-%{short_name}-grapher.pom
>+%{_mavenpomdir}/JPP-%{short_name}-jmx.pom
>+%{_mavenpomdir}/JPP-%{short_name}-jndi.pom
>+%{_mavenpomdir}/JPP-%{short_name}-multibindings.pom
>+%{_mavenpomdir}/JPP-%{short_name}-persist.pom
>+%{_mavenpomdir}/JPP-%{short_name}-servlet.pom
>+%{_mavenpomdir}/JPP-%{short_name}-spring.pom
>+%{_mavenpomdir}/JPP-%{short_name}-throwingproviders.pom
>+%{_mavendepmapfragdir}/%{name}-extensions
> 
> %files javadoc
> %doc COPYING
> %doc %{_javadocdir}/%{name}
> 
>-
>-
> %changelog
>+* Fri Oct 05 2012 gil cattaneo <puntogil@libero.it> 3.0-0.8.rc2
>+- Added sub package extensions
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0-0.7.rc2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 863279: 621852 | 621857 | 621878 | 621880 | 621882 | 621883