[springframework-batch/f20] use manual installation on F20

gil gil at fedoraproject.org
Wed Nov 6 21:57:04 UTC 2013


commit 76f45c70eb78a58d664b783d745d850501a42af2
Author: gil <puntogil at libero.it>
Date:   Wed Nov 6 22:56:19 2013 +0100

    use manual installation on F20

 springframework-batch.spec |   87 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 2 deletions(-)
---
diff --git a/springframework-batch.spec b/springframework-batch.spec
index 37a7bbc..edb8113 100644
--- a/springframework-batch.spec
+++ b/springframework-batch.spec
@@ -4,7 +4,7 @@
 %global with_vpp 0
 Name:          springframework-batch
 Version:       2.1.9
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Tools for enterprise batch or bulk processing
 License:       ASL 2.0
 URL:           http://www.springsource.org/spring-batch
@@ -15,6 +15,7 @@ BuildRequires: java-devel
 
 BuildRequires: hibernate3
 BuildRequires: hibernate3-entitymanager
+BuildRequires: mvn(cglib:cglib)
 BuildRequires: mvn(com.h2database:h2)
 BuildRequires: mvn(com.thoughtworks.xstream:xstream)
 BuildRequires: mvn(commons-collections:commons-collections)
@@ -30,7 +31,6 @@ BuildRequires: mvn(javax.mail:mail)
 BuildRequires: mvn(javax.persistence:persistence-api)
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(log4j:log4j)
-BuildRequires: mvn(net.sf.cglib:cglib)
 BuildRequires: mvn(org.aspectj:aspectjweaver)
 BuildRequires: mvn(org.easymock:easymock)
 BuildRequires: mvn(org.eclipse.gemini.blueprint:gemini-blueprint-core)
@@ -66,6 +66,47 @@ BuildRequires: maven-antrun-plugin
 BuildRequires: foundrylogic-vpp
 %endif
 
+%if %{?fedora} == 20
+Requires:      hibernate3
+Requires:      hibernate3-entitymanager
+Requires:      mvn(cglib:cglib)
+Requires:      mvn(com.h2database:h2)
+Requires:      mvn(com.thoughtworks.xstream:xstream)
+Requires:      mvn(commons-collections:commons-collections)
+Requires:      mvn(commons-dbcp:commons-dbcp)
+Requires:      mvn(commons-io:commons-io)
+%if %{?fedora} > 19
+Requires:      mvn(hsqldb:hsqldb:1)
+%else
+Requires:      mvn(hsqldb:hsqldb)
+%endif
+Requires:      mvn(javax.mail:mail)
+#Requires:      geronimo-jpa
+Requires:      mvn(javax.persistence:persistence-api)
+Requires:      mvn(junit:junit)
+Requires:      mvn(log4j:log4j)
+Requires:      mvn(org.aspectj:aspectjweaver)
+Requires:      mvn(org.easymock:easymock)
+Requires:      mvn(org.eclipse.gemini.blueprint:gemini-blueprint-core)
+Requires:      mvn(org.apache.felix:org.osgi.core)
+Requires:      mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
+Requires:      mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+Requires:      mvn(org.codehaus.jackson:jackson-mapper-asl)
+Requires:      mvn(org.codehaus.jettison:jettison)
+Requires:      mvn(org.codehaus.woodstox:woodstox-core-asl)
+Requires:      mvn(org.slf4j:slf4j-log4j12)
+Requires:      mvn(org.springframework:spring-aop)
+Requires:      mvn(org.springframework:spring-beans)
+Requires:      mvn(org.springframework:spring-context)
+Requires:      mvn(org.springframework:spring-context-support)
+Requires:      mvn(org.springframework:spring-core)
+Requires:      mvn(org.springframework:spring-jdbc)
+Requires:      mvn(org.springframework:spring-jms)
+Requires:      mvn(org.springframework:spring-orm)
+Requires:      mvn(org.springframework:spring-tx)
+Requires:      mvn(org.springframework.ws:spring-ws-core)
+%endif
+
 BuildArch:     noarch
 
 %description
@@ -278,15 +319,57 @@ rm -r spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTe
 %mvn_build -f
 
 %install
+%if %{?fedora} != 20
 %mvn_install
+%else
 
+mkdir -p %{buildroot}%{_javadir}/%{name}
+install -m 644 %{oname}-core/target/%{oname}-core-%{namedversion}.jar  \
+  %{buildroot}%{_javadir}/%{name}/%{oname}-core.jar
+install -m 644 %{oname}-infrastructure/target/%{oname}-infrastructure-%{namedversion}.jar  \
+  %{buildroot}%{_javadir}/%{name}/%{oname}-infrastructure.jar
+install -m 644 %{oname}-test/target/%{oname}-test-%{namedversion}.jar  \
+  %{buildroot}%{_javadir}/%{name}/%{oname}-test.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{oname}.pom
+%add_maven_depmap JPP.%{name}-%{oname}.pom
+install -pm 644 %{oname}-parent/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{oname}-parent.pom
+%add_maven_depmap JPP.%{name}-%{oname}-parent.pom
+
+install -pm 644 %{oname}-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{oname}-core.pom
+%add_maven_depmap JPP.%{name}-%{oname}-core.pom %{name}/%{oname}-core.jar
+install -pm 644 %{oname}-infrastructure/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{oname}-infrastructure.pom
+%add_maven_depmap JPP.%{name}-%{oname}-infrastructure.pom %{name}/%{oname}-infrastructure.jar
+install -pm 644 %{oname}-test/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{oname}-test.pom
+%add_maven_depmap JPP.%{name}-%{oname}-test.pom %{name}/%{oname}-test.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%endif
+
+%if %{?fedora} != 20
 %files -f .mfiles
+%else
+%files
+%{_javadir}/%{name}/%{oname}-*.jar
+%{_mavenpomdir}/JPP.%{name}-%{oname}*.pom
+%{_mavendepmapfragdir}/%{name}
+%endif
 %dir %{_javadir}/%{name}
 %doc README.md license.txt notice.txt
 
+%if %{?fedora} != 20
 %files javadoc -f .mfiles-javadoc
+%else
+%files javadoc
+%{_javadocdir}/%{name}
+%endif
 %doc license.txt notice.txt
 
 %changelog
+* Wed Nov 06 2013 gil cattaneo <puntogil at libero.it> 2.1.9-2
+- use manual installation on F20
+
 * Thu Nov 29 2012 gil cattaneo <puntogil at libero.it> 2.1.9-1
 - initial rpm
\ No newline at end of file


More information about the scm-commits mailing list