[maven-plugin-cobertura] Update to upstream 2.5.1 version.
by Alexander Kurtakov
commit 040bac66d510b9c11023ce0c6a9dc4f68bc4b3a7
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 05:22:00 2011 +0300
Update to upstream 2.5.1 version.
.gitignore | 1 +
maven-plugin-cobertura-2.3-SiteRenderer.patch | 29 -------------------
maven-plugin-cobertura.spec | 38 ++++++++----------------
sources | 2 +-
4 files changed, 15 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index deefcc5..19b4f4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-plugin-cobertura-2.3.tar.bz2
cobertura-maven-plugin-2.4-source-release.zip
+/cobertura-maven-plugin-2.5.1-source-release.zip
diff --git a/maven-plugin-cobertura.spec b/maven-plugin-cobertura.spec
index 7d6f104..b0faf70 100644
--- a/maven-plugin-cobertura.spec
+++ b/maven-plugin-cobertura.spec
@@ -1,17 +1,17 @@
Name: maven-plugin-cobertura
-Version: 2.4
-Release: 2%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
Summary: Plugin providing the features of Cobertura within Maven
Group: Development/Libraries
License: ASL 2.0 and GPLv2 and GPLv2+
URL: http://mojo.codehaus.org/cobertura-maven-plugin/
-Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/2....
+Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/%{...
# Fix compile with our doxia.
Patch0: maven-plugin-cobertura-2.3-SiteRenderer.patch
BuildArch: noarch
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
@@ -19,7 +19,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
@@ -27,7 +27,7 @@ BuildRequires: gnu-getopt >= 0:1.0.13
BuildRequires: cobertura
BuildRequires: mojo-parent
-Requires: maven2
+Requires: maven
Requires: cobertura
Requires: mojo-parent
Requires(post): jpackage-utils
@@ -43,7 +43,6 @@ of your Java program are lacking test coverage.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
%description javadoc
@@ -51,55 +50,44 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n cobertura-maven-plugin-%{version}
-%patch0 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL package javadoc:javadoc
-
+mvn-rpmbuild -Dmaven.test.failure.ignore=true package javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 target/cobertura-maven-plugin-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura.jar
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -p -m 644 pom.xml \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-cobertura.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-plugin-cobertura.pom
%add_to_maven_depmap org.codehaus.mojo cobertura-maven-plugin %{version} JPP maven-plugin-cobertura
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
%postun
%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_mavenpomdir}/JPP-%{name}*.pom
-%config(noreplace) %{_mavendepmapfragdir}
+%{_mavendepmapfragdir}
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.5.1-1
+- Update to upstream 2.5.1 version.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 6ff3271..3cf6822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd09f32b260b3cd54beb8cc8349b63a2 cobertura-maven-plugin-2.4-source-release.zip
+87f2565071b7ad8df60175fb663e0809 cobertura-maven-plugin-2.5.1-source-release.zip
13 years
[maven-idea-plugin] Build with maven 3.x
by Alexander Kurtakov
commit 380a6ac9b0a5007d3f74130f1b694c2ee635aee6
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 03:16:39 2011 +0300
Build with maven 3.x
maven-idea-plugin.spec | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/maven-idea-plugin.spec b/maven-idea-plugin.spec
index c58a5b2..09978f7 100644
--- a/maven-idea-plugin.spec
+++ b/maven-idea-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-idea-plugin
Version: 2.2
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Maven IDEA Plugin
Group: Development/Libraries
@@ -9,28 +9,27 @@ URL: http://maven.apache.org/plugins/%{name}
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2
# tar caf maven-idea-plugin-2.2.tar.xz maven-idea-plugin-2.2
Source0: %{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
BuildRequires: maven-wagon
BuildRequires: plexus-container-default
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
BuildRequires: dom4j
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -54,26 +53,18 @@ Requires: jpackage-utils
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
# we skip test because even with binary mvn release these fail for
# various reasons.
-mvn-jpp -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
+mvn-rpmbuild -e \
+ -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
@@ -81,10 +72,8 @@ install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -92,21 +81,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-5
+- Build with maven 3.x
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years
[maven-rar-plugin] Build with maven 3.x.
by Alexander Kurtakov
commit 518a4135703581e938100eef60537b5d308f11df
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 03:10:15 2011 +0300
Build with maven 3.x.
maven-rar-plugin.spec | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/maven-rar-plugin.spec b/maven-rar-plugin.spec
index aa56114..65fb1b8 100644
--- a/maven-rar-plugin.spec
+++ b/maven-rar-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-rar-plugin
Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugin to create Resource Adapter Archive which can be deployed to a J2EE server
Group: Development/Libraries
@@ -9,25 +9,24 @@ URL: http://maven.apache.org/plugins/maven-rar-plugin/
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-rar-plugin-2.2/
# tar jcf maven-rar-plugin-2.2.tar.bz2 maven-rar-plugin-2.2/
Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: jpackage-utils
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -54,28 +53,18 @@ API documentation for %{name}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
#FIXME: mvn-jpp doesn't build jar "maven-rar-plugin-2.2/target/unit/basic-rar-test/target/test-rar.rar", why?
-mvn-jpp \
- -e \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -85,10 +74,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -96,21 +83,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-5
+- Build with maven 3.x.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years
[maven-plugin-bundle] Do not depend on maven2.
by Alexander Kurtakov
commit 0837f9156e2e3bfb01626673f16264d369c5d64c
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 02:59:43 2011 +0300
Do not depend on maven2.
maven-plugin-bundle.spec | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2d73b0f..2ec3e9d 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@@ -28,7 +28,7 @@ Requires: aqute-bndlib >= 0.0.363
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
Requires: kxml
-Requires: maven2
+Requires: maven
Requires: maven-archiver
Requires: maven-shared-dependency-tree
Requires: maven-wagon
@@ -56,12 +56,9 @@ API documentation for %{name}.
%setup -q -n maven-bundle-plugin-%{version}
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/maven-bundle-plugin-%{version}.jar \
@@ -70,9 +67,9 @@ install -m 644 target/maven-bundle-plugin-%{version}.jar \
%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
# poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
- %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -86,16 +83,17 @@ rm -rf target/site/api*
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-10
+- Do not depend on maven2.
+
* Thu Feb 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-9
- BR maven-surefire-provider-junit4.
13 years
[maven-war-plugin] Do not depend on maven2.
by Alexander Kurtakov
commit 745e2cdd4eadcbefeb478906b02f6dd2b53fc9ef
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 02:52:58 2011 +0300
Do not depend on maven2.
maven-war-plugin.spec | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index f452a9f..dd2b810 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-war-plugin
Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven WAR Plugin
Group: Development/Libraries
@@ -36,7 +36,7 @@ BuildRequires: maven-invoker-plugin
BuildRequires: xstream
Requires: java
-Requires: maven2
+Requires: maven
Requires: xstream
Requires: jpackage-utils
Requires(post): jpackage-utils
@@ -61,11 +61,7 @@ API documentation for %{name}.
%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
-mvn-local -e \
- -Dmaven.test.skip=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild -Dmaven.test.skip=true \
install javadoc:javadoc
%install
@@ -81,10 +77,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -93,17 +87,17 @@ rm -rf target/site/api*
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.1-4
+- Do not depend on maven2.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years
[maven-jflex-plugin] Build with maven 3.x
by Alexander Kurtakov
commit 7aed9c0fb67345523cffddd118fa0bc5f55cea96
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Fri Jun 17 02:46:18 2011 +0300
Build with maven 3.x
maven-jflex-plugin.spec | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/maven-jflex-plugin.spec b/maven-jflex-plugin.spec
index 4db6b2d..49e719e 100644
--- a/maven-jflex-plugin.spec
+++ b/maven-jflex-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-jflex-plugin
Version: 1.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven JFlex Plugin
Group: Development/Libraries
@@ -10,13 +10,12 @@ URL: http://jflex.sourceforge.net/maven-jflex-plugin/
# svn export http://jflex.svn.sourceforge.net/svnroot/jflex/tags/release_1_4_3/maven-j... maven-jflex-plugin-1.4.3
# tar cjf maven-jflex-plugin-1.4.3.tar.bz2 maven-jflex-plugin-1.4.3/
Source0: maven-jflex-plugin-1.4.3.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jflex
BuildRequires: apache-commons-io
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
@@ -29,7 +28,7 @@ BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
Requires: jflex
Requires: apache-commons-io
-Requires: maven2
+Requires: maven
%description
This is a Maven 2 plugin to generate a parser in Java code from
@@ -39,6 +38,7 @@ a Lexer definition, using Jflex.de.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -47,40 +47,25 @@ API documentation for %{name}.
%prep
%setup -q
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap de.jflex %{name} %{version} JPP %{name}
# poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
- %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -88,21 +73,18 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.4.3-5
+- Build with maven 3.x.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years
[Bug 661034] New: FTBFS maven-assembly-plugin-2.2-0.4.beta5.fc14
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: FTBFS maven-assembly-plugin-2.2-0.4.beta5.fc14
https://bugzilla.redhat.com/show_bug.cgi?id=661034
Summary: FTBFS maven-assembly-plugin-2.2-0.4.beta5.fc14
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: maven-assembly-plugin
AssignedTo: yyang(a)redhat.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: yyang(a)redhat.com, huwang(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 659965
Classification: Fedora
maven-assembly-plugin-2.2-0.4.beta5.fc14.src.rpm Failed To Build From Source
against the rawhide tree. See http://fedoraproject.org/wiki/FTBFS for more
information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years
[Bug 661011] New: FTBFS hamcrest-1.1-9.3.fc15
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: FTBFS hamcrest-1.1-9.3.fc15
https://bugzilla.redhat.com/show_bug.cgi?id=661011
Summary: FTBFS hamcrest-1.1-9.3.fc15
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: hamcrest
AssignedTo: dwalluck(a)redhat.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: dwalluck(a)redhat.com, akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 659965
Classification: Fedora
hamcrest-1.1-9.3.fc15.src.rpm Failed To Build From Source against the rawhide
tree. See http://fedoraproject.org/wiki/FTBFS for more information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years