Build with maven 3.x.
This commit is contained in:
parent
1abee19eaa
commit
ca367a5031
@ -18,12 +18,7 @@ Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource
|
||||
Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
|
||||
Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
|
||||
|
||||
# Remove maven-release plugin (not yet available on Fedora)
|
||||
Patch0: apache-resource-bundles-cleanup-poms.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: maven2
|
||||
BuildRequires: maven
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
@ -47,7 +42,6 @@ and notices for all Apache releases.
|
||||
%prep
|
||||
%setup -c -T
|
||||
cp %SOURCE0 ./pom.xml
|
||||
%patch0 -p1
|
||||
|
||||
# jar
|
||||
mkdir -p apache-jar-resource-bundle
|
||||
@ -78,16 +72,9 @@ popd
|
||||
|
||||
|
||||
%build
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
mkdir -p $MAVEN_REPO_LOCAL
|
||||
|
||||
mvn-jpp \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
install
|
||||
mvn-rpmbuild install
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
|
||||
@ -96,7 +83,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
pushd apache-jar-resource-bundle
|
||||
install -m 644 \
|
||||
target/apache-jar-resource-bundle-%{jar_version}.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/jar-%{jar_version}.jar
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/jar.jar
|
||||
cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jar.pom
|
||||
%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP/%{name} jar
|
||||
popd
|
||||
@ -105,7 +92,7 @@ popd
|
||||
pushd apache-license-header-resource-bundle
|
||||
install -m 644 \
|
||||
target/apache-license-header-resource-bundle-%{lh_version}.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/license-header-%{lh_version}.jar
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/license-header.jar
|
||||
cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-license-header.pom
|
||||
%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP/%{name} license-header
|
||||
popd
|
||||
@ -114,25 +101,15 @@ popd
|
||||
pushd apache-incubator-disclaimer-resource-bundle
|
||||
install -m 644 \
|
||||
target/apache-incubator-disclaimer-resource-bundle-%{id_version}.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer-%{id_version}.jar
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer.jar
|
||||
cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-incubator-disclaimer.pom
|
||||
%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP/%{name} incubator-disclaimer
|
||||
popd
|
||||
|
||||
# Unversioned jars
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||
ln -sf jar-%{jar_version}.jar jar.jar
|
||||
ln -sf license-header-%{lh_version}.jar license-header.jar
|
||||
ln -sf incubator-disclaimer-%{id_version}.jar incubator-disclaimer.jar
|
||||
popd
|
||||
|
||||
# Add parent to depmap too
|
||||
cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_to_maven_depmap org.apache %{name} %{version} JPP %{name}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
@ -140,13 +117,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%update_maven_depmap
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{name}
|
||||
%config(noreplace) %{_mavendepmapfragdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
%{_mavenpomdir}/*.pom
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user