- Update to alpha 15 courtesy Deepak Bhole
This commit is contained in:
Andrew Overholt
parent
4a53ee1486
commit
a9bb07f8f9
@ -1 +1 @@
|
||||
modello-1.0-alpha-8-src.tar.gz
|
||||
modello-1.0-alpha-15-src.tar.gz
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
--- ./modello-plugins-sandbox/pom.xml.sav 2006-06-13 17:26:21.000000000 -0400
|
||||
+++ ./modello-plugins-sandbox/pom.xml 2006-06-13 17:26:33.000000000 -0400
|
||||
@@ -20,6 +20,7 @@
|
||||
</dependency>
|
||||
diff -up ./modello-plugins-sandbox/pom.xml.sav ./modello-plugins-sandbox/pom.xml
|
||||
--- ./modello-plugins-sandbox/pom.xml.sav 2008-06-18 17:06:26.000000000 -0400
|
||||
+++ ./modello-plugins-sandbox/pom.xml 2008-06-18 17:06:37.000000000 -0400
|
||||
@@ -21,6 +21,7 @@
|
||||
</dependencies>
|
||||
<modules>
|
||||
+ <module>modello-plugin-dom4j</module>
|
||||
<module>modello-plugin-hibernate-old</module>
|
||||
<module>modello-plugin-ojb</module>
|
||||
+ <module>modello-plugin-prevayler</module>
|
||||
<!--
|
||||
<module>modello-plugin-jdbc</module>
|
||||
<module>modello-plugin-ojb</module>
|
||||
--- ./pom.xml.sav 2006-01-11 22:40:51.000000000 -0500
|
||||
+++ ./pom.xml 2006-06-13 17:26:12.000000000 -0400
|
||||
@@ -161,6 +161,7 @@
|
||||
<module>modello-core</module>
|
||||
<module>modello-plugin-velocity</module>
|
||||
diff -up ./pom.xml.sav ./pom.xml
|
||||
--- ./pom.xml.sav 2008-06-18 17:06:01.000000000 -0400
|
||||
+++ ./pom.xml 2008-06-18 17:06:18.000000000 -0400
|
||||
@@ -157,6 +157,7 @@
|
||||
<module>modello-db-keywords</module>
|
||||
<module>modello-test</module>
|
||||
<module>modello-plugins</module>
|
||||
+ <module>modello-plugins-sandbox</module>
|
||||
+ <module>modello-plugins-sandbox</module>
|
||||
</modules>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<repositories>
|
||||
<repository>
|
||||
|
||||
@ -12,6 +12,43 @@
|
||||
</jpp>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-component-api</artifactId>
|
||||
<version>1.0-alpha-15</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/plexus</groupId>
|
||||
<artifactId>container-default</artifactId>
|
||||
<version>1.0-alpha-8</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>containers-containers-default</artifactId>
|
||||
<version>1.0-alpha-15</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/plexus</groupId>
|
||||
<artifactId>container-default</artifactId>
|
||||
<version>1.0-alpha-8</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-interactivity-api</artifactId>
|
||||
<version>1.0-alpha-4</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/plexus</groupId>
|
||||
<artifactId>interactivity-api</artifactId>
|
||||
<version>1.0-alpha-1</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
<!-- unnecessary jars -->
|
||||
<dependency>
|
||||
<maven>
|
||||
@ -37,5 +74,54 @@
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<!-- jars needed for test only, that we don't have yet in Fedora -->
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.apache.derby</groupId>
|
||||
<artifactId>derby</artifactId>
|
||||
<version>10.1.3.1</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>jpox</groupId>
|
||||
<artifactId>jpox-enhancer</artifactId>
|
||||
<version>1.1.1</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>jpox</groupId>
|
||||
<artifactId>jpox</artifactId>
|
||||
<version>1.1.1</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>net.java.dev.stax-utils</groupId>
|
||||
<artifactId>stax-utils</artifactId>
|
||||
<version>20060502</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.0</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.codehaus.plexus.registry</groupId>
|
||||
<artifactId>plexus-registry-commons</artifactId>
|
||||
<version>1.0-alpha-2</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/utils classworlds)
|
||||
export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/containers-container-default plexus/utils plexus/classworlds)
|
||||
${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@
|
||||
|
||||
92
modello.spec
92
modello.spec
@ -34,44 +34,38 @@
|
||||
|
||||
%define repo_dir .m2/repository
|
||||
|
||||
%define namedversion 1.0-alpha-8
|
||||
%define namedversion 1.0-alpha-15
|
||||
%define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
|
||||
|
||||
Name: modello
|
||||
Version: 1.0
|
||||
Release: 0.3.a8.4.4%{?dist}
|
||||
Release: 0.4.a15.0.1%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Modello Data Model toolkit
|
||||
License: MIT
|
||||
Group: Development/Java
|
||||
URL: http://modello.codehaus.org/
|
||||
Source0: %{name}-%{namedversion}-src.tar.gz
|
||||
# svn export svn://svn.modello.codehaus.org/modello/tags/modello-1.0-alpha-8/
|
||||
# tar czf modello-1.0-alpha-8-src.tar.gz modello-1.0-alpha-8/
|
||||
# svn export https://svn.codehaus.org/modello/tags/modello-1.0-alpha-15/
|
||||
# tar czf modello-1.0-alpha-15-src.tar.gz modello-1.0-alpha-15/
|
||||
Source1: modello.script
|
||||
|
||||
Source2: %{name}-jpp-depmap.xml
|
||||
|
||||
Patch0: modello-hibernateold-artifactid-fix.patch
|
||||
Patch1: modello-build-all-plugins.patch
|
||||
%if %{gcj_support}
|
||||
BuildRequires: java-gcj-compat-devel
|
||||
Requires(post): java-gcj-compat
|
||||
Requires(postun): java-gcj-compat
|
||||
%endif
|
||||
%if ! %{gcj_support}
|
||||
Patch2: modello-use-old-pdcontainer.patch
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: ant >= 0:1.6
|
||||
BuildRequires: jpackage-utils >= 0:1.7.2
|
||||
BuildRequires: maven2 >= 2.0.4-9
|
||||
BuildRequires: maven2-plugin-assembly
|
||||
BuildRequires: maven2-plugin-compiler
|
||||
BuildRequires: maven2-plugin-install
|
||||
BuildRequires: maven2-plugin-jar
|
||||
BuildRequires: maven2-plugin-javadoc
|
||||
BuildRequires: maven2-plugin-release
|
||||
BuildRequires: maven2-plugin-resources
|
||||
BuildRequires: maven2-plugin-surefire
|
||||
BuildRequires: maven2-plugin-plugin
|
||||
@ -113,17 +107,15 @@ Java model to [JPOX|http://www.jpox.org/] Mapping.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Documentation
|
||||
# for /bin/rm and /bin/ln
|
||||
Requires(post): coreutils
|
||||
Requires(postun): coreutils
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{namedversion}
|
||||
%patch0 -b .sav
|
||||
#%patch0 -b .sav
|
||||
%patch1 -b .sav
|
||||
%patch2 -b .sav
|
||||
|
||||
find . -name release-pom.xml -exec rm -f '{}' \;
|
||||
|
||||
@ -143,10 +135,35 @@ mkdir -p $MAVEN_REPO_LOCAL
|
||||
|
||||
mvn-jpp \
|
||||
-e \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
|
||||
-Dmaven.test.failure.ignore=true \
|
||||
install javadoc:javadoc
|
||||
install
|
||||
|
||||
# Manual iteration should not be needed, but there is a bug in the javadoc
|
||||
# plugin which makes this necessary. See:
|
||||
# http://jira.codehaus.org/browse/MJAVADOC-157
|
||||
for dir in modello-*; do
|
||||
pushd $dir
|
||||
mvn-jpp \
|
||||
-e \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
|
||||
-Dmaven.test.failure.ignore=true \
|
||||
javadoc:javadoc
|
||||
popd
|
||||
done
|
||||
|
||||
for dir in modello-plugins/modello-plugin-*; do
|
||||
pushd $dir
|
||||
mvn-jpp \
|
||||
-e \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
|
||||
-Dmaven.test.failure.ignore=true \
|
||||
javadoc:javadoc
|
||||
popd
|
||||
done
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -191,60 +208,43 @@ done
|
||||
# Do it again for sandbox plugins, which have a different version
|
||||
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-1.0-alpha-4-SNAPSHOT*; do ln -sf ${jar} `echo $jar| sed "s|-1.0-alpha-4-SNAPSHOT||g"`; done)
|
||||
|
||||
# Prevayler is in a sandbox and has a different version
|
||||
ln -s plugin-prevayler-1.0-alpha-12-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/plugin-prevayler.jar
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
for target in $(find -type d -name target); do
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
|
||||
cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
|
||||
if [ -d $target/site/apidocs ]; then
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
|
||||
cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
|
||||
fi
|
||||
done
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%if %{gcj_support}
|
||||
%{_bindir}/aot-compile-rpm
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
%update_maven_depmap
|
||||
|
||||
%postun
|
||||
%if %{gcj_support}
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
%update_maven_depmap
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/maven2
|
||||
%dir %{_javadir}/%{name}
|
||||
%{_javadir}/%{name}
|
||||
%attr(755,root,root) %{_bindir}/*
|
||||
%{_mavendepmapfragdir}
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/*.jar.*
|
||||
%endif
|
||||
%config(noreplace) /etc/maven/fragments/modello
|
||||
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_javadocdir}/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 20 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.4.a15.0.1
|
||||
- Update to alpha 15 courtesy Deepak Bhole
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.3.a8.4.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user