[maven-ant-tasks/f15/master: 2/3] Install unversioned jar & javadocs
by Stanislav Ochotnicky
commit 5554ebaeebaef2198dd5d7c91d27366902aa7380
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 16 17:32:12 2011 +0100
Install unversioned jar & javadocs
maven-ant-tasks.spec | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index e7d592b..20982c8 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
Name: maven-ant-tasks
Version: 2.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Allow Maven artifact handling features to be used from within an Ant build
Group: Development/Libraries
@@ -12,7 +12,6 @@ Source0: http://www.apache.org/dist/maven/source/maven-ant-tasks-%{versio
Source1: %{name}.depmap
#Fix up ant groupId
Patch0: maven-ant-tasks-2.1.1-ant-groupId.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -65,7 +64,7 @@ This package contains the API documentation for %{name}.
for f in src/it/*/invoker.properties
do
tp=${f/invoker/test}
- cat >> $tp <<EOF
+ cat >> $tp <<EOF
maven2.jpp.mode=1
EOF
done
@@ -82,27 +81,26 @@ mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/original-%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp target/site/apidocs \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
-$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -122,10 +120,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc LICENSE
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Feb 16 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.1.1-8
+- Install unversioned jar & javadocs
+
* Wed Feb 16 2011 Orion Poplawski <orion(a)cora.nwra.com> 2.1.1-7
- Install the unbundled jar (bug #677736)
13 years, 2 months
[maven-ant-tasks/f15/master] - Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901
by Orion Poplawski
commit 883e455f7287b77df4dd7b95744f6cf2698d9b06
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Wed Feb 16 09:03:25 2011 -0700
- Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901
maven-ant-tasks.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index d3e332c..e7d592b 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
Name: maven-ant-tasks
Version: 2.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Allow Maven artifact handling features to be used from within an Ant build
Group: Development/Libraries
@@ -85,7 +85,7 @@ mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar \
+cp -p target/original-%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 16 2011 Orion Poplawski <orion(a)cora.nwra.com> 2.1.1-7
+- Install the unbundled jar (bug #677736)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 2 months
[maven-ant-tasks] - Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901
by Orion Poplawski
commit 7e51c97e1b5da6f110413768496317719313568d
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Wed Feb 16 09:03:25 2011 -0700
- Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901
maven-ant-tasks.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index d3e332c..e7d592b 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
Name: maven-ant-tasks
Version: 2.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Allow Maven artifact handling features to be used from within an Ant build
Group: Development/Libraries
@@ -85,7 +85,7 @@ mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar \
+cp -p target/original-%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 16 2011 Orion Poplawski <orion(a)cora.nwra.com> 2.1.1-7
+- Install the unbundled jar (bug #677736)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 2 months
[apache-commons-configuration] Change ant dep groupId to org.apache.ant to fix build (#675389)
by Stanislav Ochotnicky
commit e173b256d21674a25d515b2dfce17c3638edbb10
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 15 09:04:33 2011 +0100
Change ant dep groupId to org.apache.ant to fix build (#675389)
Versionless jar & javadocs
Use maven 3 to build
0001-Change-ant-groupId-to-org.apache.ant.patch | 34 +++++++++++++++
...-test-deps.patch => 0002-Remove-test-deps.patch | 14 ++++++-
apache-commons-configuration.spec | 45 +++++++++-----------
3 files changed, 67 insertions(+), 26 deletions(-)
---
diff --git a/0001-Change-ant-groupId-to-org.apache.ant.patch b/0001-Change-ant-groupId-to-org.apache.ant.patch
new file mode 100644
index 0000000..f9ae838
--- /dev/null
+++ b/0001-Change-ant-groupId-to-org.apache.ant.patch
@@ -0,0 +1,34 @@
+From e2ab4b597ea7d2550fc8f66520ebf8819e5a3b52 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:48:33 +0100
+Subject: [PATCH 1/2] Change ant groupId to org.apache.ant
+
+---
+ pom.xml | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 14aa243..36060d4 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,7 +260,7 @@
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ </exclusion>
+ </exclusions>
+@@ -297,7 +297,7 @@
+ </dependency>
+
+ <dependency>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+--
+1.7.4
+
diff --git a/commons-configuration-test-deps.patch b/0002-Remove-test-deps.patch
similarity index 76%
rename from commons-configuration-test-deps.patch
rename to 0002-Remove-test-deps.patch
index 5a14bec..a321376 100644
--- a/commons-configuration-test-deps.patch
+++ b/0002-Remove-test-deps.patch
@@ -1,5 +1,14 @@
+From 205dae871426e8f4ff529d8aca66f1eee0879754 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:50:15 +0100
+Subject: [PATCH 2/2] Remove test deps
+
+---
+ pom.xml | 34 ----------------------------------
+ 1 files changed, 0 insertions(+), 34 deletions(-)
+
diff --git a/pom.xml b/pom.xml
-index 14aa243..50396e2 100644
+index 36060d4..6c372fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,13 +327,6 @@
@@ -50,3 +59,6 @@ index 14aa243..50396e2 100644
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
+--
+1.7.4
+
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index c70fa7a..716ed47 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,16 +4,15 @@
Name: apache-%{short_name}
Version: 1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-# TODO: make upstream fix ant:ant groupId
-Source1: %{name}-depmap.xml
-Patch0: %{short_name}-test-deps.patch
+Patch0: 0001-Change-ant-groupId-to-org.apache.ant.patch
+Patch1: 0002-Remove-test-deps.patch
BuildArch: noarch
BuildRequires: java-devel
@@ -30,6 +29,7 @@ BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
+BuildRequires: maven
BuildRequires: xalan-j2
BuildRequires: xerces-j2
@@ -96,35 +96,24 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
+%patch1 -p1
%{__sed} -i 's/\r//' LICENSE.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+# we skip tests because we don't have test deps
+mvn-rpmbuild -Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Install pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -135,8 +124,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -154,11 +145,15 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Feb 15 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6-5
+- Change ant dep groupId to org.apache.ant to fix build
+- Versionless jar & javadocs
+- Use maven 3 to build
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years, 2 months
[apache-commons-configuration/f14/master] Change ant dep groupId to org.apache.ant to fix build (#675389)
by Stanislav Ochotnicky
commit bec676c9284c338e756181ba8d42ce719420b226
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Feb 14 18:53:23 2011 +0100
Change ant dep groupId to org.apache.ant to fix build (#675389)
0001-Change-ant-groupId-to-org.apache.ant.patch | 34 ++++++++++++++++++++
...-test-deps.patch => 0002-Remove-test-deps.patch | 14 +++++++-
apache-commons-configuration.spec | 9 ++++-
3 files changed, 54 insertions(+), 3 deletions(-)
---
diff --git a/0001-Change-ant-groupId-to-org.apache.ant.patch b/0001-Change-ant-groupId-to-org.apache.ant.patch
new file mode 100644
index 0000000..f9ae838
--- /dev/null
+++ b/0001-Change-ant-groupId-to-org.apache.ant.patch
@@ -0,0 +1,34 @@
+From e2ab4b597ea7d2550fc8f66520ebf8819e5a3b52 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:48:33 +0100
+Subject: [PATCH 1/2] Change ant groupId to org.apache.ant
+
+---
+ pom.xml | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 14aa243..36060d4 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,7 +260,7 @@
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ </exclusion>
+ </exclusions>
+@@ -297,7 +297,7 @@
+ </dependency>
+
+ <dependency>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+--
+1.7.4
+
diff --git a/commons-configuration-test-deps.patch b/0002-Remove-test-deps.patch
similarity index 76%
rename from commons-configuration-test-deps.patch
rename to 0002-Remove-test-deps.patch
index 5a14bec..a321376 100644
--- a/commons-configuration-test-deps.patch
+++ b/0002-Remove-test-deps.patch
@@ -1,5 +1,14 @@
+From 205dae871426e8f4ff529d8aca66f1eee0879754 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 14 Feb 2011 18:50:15 +0100
+Subject: [PATCH 2/2] Remove test deps
+
+---
+ pom.xml | 34 ----------------------------------
+ 1 files changed, 0 insertions(+), 34 deletions(-)
+
diff --git a/pom.xml b/pom.xml
-index 14aa243..50396e2 100644
+index 36060d4..6c372fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,13 +327,6 @@
@@ -50,3 +59,6 @@ index 14aa243..50396e2 100644
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
+--
+1.7.4
+
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index f19801c..3e0d3dc 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,14 +4,15 @@
Name: apache-%{short_name}
Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-Patch0: %{short_name}-test-deps.patch
+Patch0: 0001-Change-ant-groupId-to-org.apache.ant.patch
+Patch1: 0002-Remove-test-deps.patch
BuildArch: noarch
BuildRequires: java-devel
@@ -95,6 +96,7 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
+%patch1 -p1
%{__sed} -i 's/\r//' LICENSE.txt
%build
@@ -157,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 14 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6-3
+- Change ant dep groupId to org.apache.ant to fix build
+
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6-2
- Add license to javadoc subpackage
13 years, 2 months
[maven-plugin-tools] Update to new upstream release.
by Alexander Kurtakov
commit a916b495fd63ba73778e3e79436b5f84b2938f3b
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Sat Feb 12 17:45:07 2011 +0200
Update to new upstream release.
Adapt to current guidelines.
.gitignore | 1 +
0001-fix-for-new-jtidy.patch | 67 +++++++++++++++--------------------------
maven-plugin-tools.spec | 58 +++++++++++++++---------------------
sources | 1 +
4 files changed, 51 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffee22d..02173e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-plugin-tools-2.1-src.tar.gz
maven-plugin-tools-2.6.tar.xz
+maven-plugin-tools-2.7-source-release.zip
diff --git a/0001-fix-for-new-jtidy.patch b/0001-fix-for-new-jtidy.patch
index bebde49..a4b2821 100644
--- a/0001-fix-for-new-jtidy.patch
+++ b/0001-fix-for-new-jtidy.patch
@@ -1,43 +1,26 @@
-From 5fdd641a5c85c65338ddb8c6ed3ffbfef46f62b0 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Wed, 29 Sep 2010 13:25:06 +0200
-Subject: [PATCH] fix for new jtidy
-
----
- maven-plugin-tools-api/pom.xml | 4 ++--
- .../maven/tools/plugin/util/PluginUtils.java | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
-index e05a1fc..6525863 100644
---- a/maven-plugin-tools-api/pom.xml
-+++ b/maven-plugin-tools-api/pom.xml
+--- maven-plugin-tools-api/pom.xml.orig 2010-05-01 15:49:32.000000000 +0300
++++ maven-plugin-tools-api/pom.xml 2011-02-12 17:30:20.937431517 +0200
@@ -83,9 +83,9 @@
-
- <!-- misc -->
- <dependency>
-- <groupId>jtidy</groupId>
-+ <groupId>net.sf.jtidy</groupId>
- <artifactId>jtidy</artifactId>
-- <version>4aug2000r7-dev</version>
-+ <version>r938</version>
- </dependency>
-
- <!-- test -->
-diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
-index f89c036..09e25fe 100644
---- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
-+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
-@@ -265,7 +265,8 @@ public final class PluginUtils
- tidy.setDocType( "loose" );
- tidy.setXHTML( true );
- tidy.setXmlOut( true );
-- tidy.setCharEncoding( Configuration.UTF8 );
-+ tidy.setInputEncoding("UTF-8");
-+ tidy.setOutputEncoding("UTF-8");
- tidy.setMakeClean( true );
- tidy.setNumEntities( true );
- tidy.setQuoteNbsp( false );
---
-1.7.2.3
-
+
+ <!-- misc -->
+ <dependency>
+- <groupId>jtidy</groupId>
++ <groupId>net.sf.jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+- <version>4aug2000r7-dev</version>
++ <version>r938</version>
+ </dependency>
+
+ <!-- test -->
+--- maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java.orig 2010-05-01 15:49:32.000000000 +0300
++++ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java 2011-02-12 17:32:13.115079407 +0200
+@@ -265,7 +265,8 @@ public final class PluginUtils
+ tidy.setDocType( "loose" );
+ tidy.setXHTML( true );
+ tidy.setXmlOut( true );
+- tidy.setCharEncoding( Configuration.UTF8 );
++ tidy.setInputEncoding("UTF-8");
++ tidy.setOutputEncoding("UTF-8");
+ tidy.setMakeClean( true );
+ tidy.setNumEntities( true );
+ tidy.setQuoteNbsp( false );
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index b764607..0a7ce36 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,24 +1,22 @@
Name: maven-plugin-tools
-Version: 2.6
-Release: 9%{?dist}
+Version: 2.7
+Release: 1%{?dist}
Summary: Maven Plugin Tools
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-tools/
Epoch: 0
-#svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tool... maven-plugin-tools-2.6
-#tar caf maven-plugin-tools-2.6.tar.xz maven-plugin-tools-2.6/
-Source0: %{name}-%{version}.tar.xz
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{ver...
# this patch should be upstreamed (together with updated pom.xml
# dependency version on jtidy 8.0)
Patch0: 0001-fix-for-new-jtidy.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-resources-plugin
@@ -35,7 +33,7 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-test-tools
BuildRequires: maven-plugin-testing-harness
-Requires: maven2
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -136,41 +134,31 @@ plugin registry, the artifact metadata and a generic help goal.
%prep
%setup -q
-%patch0 -p1
-rm -fr src/site/site.xml
+%patch0
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
+mvn-rpmbuild \
package javadoc:aggregate
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 755 %{buildroot}%{_javadir}/%{name}
install -pm 644 maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/ant-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/ant.jar
install -pm 644 maven-plugin-tools-api/target/maven-plugin-tools-api-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/api-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/api.jar
install -pm 644 maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/beanshell-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/beanshell.jar
install -pm 644 maven-plugin-tools-java/target/maven-plugin-tools-java-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/java-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/java.jar
install -pm 644 maven-plugin-tools-javadoc/target/maven-plugin-tools-javadoc-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/javadoc-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/javadoc.jar
install -pm 644 maven-plugin-tools-model/target/maven-plugin-tools-model-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/model-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/model.jar
install -pm 644 maven-plugin-plugin/target/maven-plugin-plugin-%{version}.jar \
- %{buildroot}%{_javadir}/maven-plugin-tools/plugin-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ %{buildroot}%{_javadir}/maven-plugin-tools/plugin.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -208,11 +196,14 @@ install -pm 644 maven-plugin-plugin/pom.xml \
%add_to_maven_depmap org.apache.maven.plugins maven-plugin-plugin %{version} JPP/%{name} plugin
# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -220,9 +211,6 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -231,7 +219,6 @@ rm -rf %{buildroot}
%files javadocs
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files ant
@@ -249,7 +236,6 @@ rm -rf %{buildroot}
%files java
%defattr(-,root,root,-)
%{_javadir}/%{name}/java.*
-%{_javadir}/%{name}/java-*
%files javadoc
%defattr(-,root,root,-)
@@ -264,6 +250,10 @@ rm -rf %{buildroot}
%{_javadir}/%{name}/plugin*
%changelog
+* Sat Feb 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.7-1
+- Update to new upstream release.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 015c406..c12c8a9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
a92f27048203aeb39989a658a1ee66c8 maven-plugin-tools-2.6.tar.xz
+c1921e14bee0a85cc3500f0b611ff6af maven-plugin-tools-2.7-source-release.zip
13 years, 2 months