rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.0.3

Browse Source 
- Add ext subdirectory to lib
This commit is contained in:
Stanislav Ochotnicky 2011-03-04 11:23:44 +01:00
parent 9667d78a30
commit 49f4ff0cb6
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/apache-maven-3.0-src.tar.gz /apache-maven-3.0-src.tar.gz
/apache-maven-3.0.2-src.tar.gz /apache-maven-3.0.2-src.tar.gz
/apache-maven-3.0.3-RC1-src.tar.gz /apache-maven-3.0.3-RC1-src.tar.gz
/apache-maven-3.0.3-src.tar.gz

18
maven.spec
View File

@ -1,8 +1,7 @@
%global ver_add -RC1
Name: maven Name: maven
Version: 3.0.3 Version: 3.0.3
Release: 0.1.rc1%{?dist} Release: 1%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -10,7 +9,7 @@ License: ASL 2.0 and MIT and BSD
URL: http://maven.apache.org/ URL: http://maven.apache.org/
# Source URL is for testing only, final version will be in different place: # Source URL is for testing only, final version will be in different place:
# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{version}-src.tar.gz # http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{version}-src.tar.gz
Source0: https://repository.apache.org/content/repositories/maven-049/org/apache/maven/apache-%{name}/%{version}%{ver_add}/apache-%{name}-%{version}%{ver_add}-src.tar.gz Source0: http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{version}-src.tar.gz
# custom resolver java files # custom resolver java files
# source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/ # source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/
@ -103,7 +102,7 @@ Requires: jpackage-utils
%{summary}. %{summary}.
%prep %prep
%setup -q -n apache-%{name}-%{version}%{ver_add} %setup -q -n apache-%{name}-%{version}%{?ver_add}
%patch150 -p1 %patch150 -p1
%patch200 -p1 %patch200 -p1
@ -141,12 +140,12 @@ mvn-rpmbuild -e install javadoc:aggregate
mkdir m2home mkdir m2home
(cd m2home (cd m2home
tar xvf ../apache-maven/target/*tar.gz tar xvf ../apache-maven/target/*tar.gz
chmod -x apache-%{name}-%{version}%{ver_add}/conf/settings.xml chmod -x apache-%{name}-%{version}%{?ver_add}/conf/settings.xml
) )
%install %install
export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{ver_add} export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{?ver_add}
# maven2 directory in /usr/share/java # maven2 directory in /usr/share/java
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@ -207,6 +206,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \ sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \
maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \ maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \
xbean/xbean-reflect xerces-j2 jdom xml-commons-apis atinject xbean/xbean-reflect xerces-j2 jdom xml-commons-apis atinject
mkdir ext/
) )
################ ################
@ -256,7 +256,7 @@ for module in maven-aether-provider maven-artifact maven-compat \
maven-settings-builder;do maven-settings-builder;do
pushd $module pushd $module
install -m 644 target/$module-%{version}%{ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar install -m 644 target/$module-%{version}%{?ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
ln -s %{_javadir}/%{name}/$module.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/$module.jar ln -s %{_javadir}/%{name}/$module.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/$module.jar
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$module.pom install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$module.pom
%add_to_maven_depmap org.apache.maven $module %{version} JPP/%{name} $module %add_to_maven_depmap org.apache.maven $module %{version} JPP/%{name} $module
@ -308,6 +308,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog %changelog
* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-1
- Update to 3.0.3
- Add ext subdirectory to lib
* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-0.1.rc1 * Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-0.1.rc1
- Update to 3.0.3rc1 - Update to 3.0.3rc1
- Enable tests again - Enable tests again

2
sources
View File

@ -1 +1 @@
562a919758f71b8170b1f5a9b34dcccd apache-maven-3.0.3-RC1-src.tar.gz 09c0b476d8ff2120c673a7fc06bd662a apache-maven-3.0.3-src.tar.gz