[maven-plugin-bundle] Remove old javadoc dir name.
by Alexander Kurtakov
commit 5d81a091225201dd107f6da3efb47ca0c5bd1bc3
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 15 21:28:29 2010 +0200
Remove old javadoc dir name.
maven-plugin-bundle.spec | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 13070c0..dfac11c 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -78,7 +78,7 @@ install -pm 644 pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
@@ -96,7 +96,6 @@ rm -rf target/site/api*
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
13 years, 4 months
[maven-plugin-bundle] - BR/R felix-parent.
by Alexander Kurtakov
commit 95794526ddefc931532dd4bf9c783a7d21823b17
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 15 21:25:33 2010 +0200
- BR/R felix-parent.
maven-plugin-bundle.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index bc8ef14..13070c0 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,13 +1,12 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 5%{?dist}
+Release: 7 %{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
License: ASL 2.0
URL: http://felix.apache.org
Source0: http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: aqute-bndlib >= 0.0.363
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
@@ -23,6 +22,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit >= 2.3
BuildRequires: maven-doxia-sitetools
+BuildRequires: felix-parent
Requires: aqute-bndlib >= 0.0.363
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
@@ -33,6 +33,7 @@ Requires: maven-shared-dependency-tree
Requires: maven-wagon
Requires: plexus-archiver
Requires: plexus-containers-container-default
+Requires: felix-parent
BuildArch: noarch
@@ -45,6 +46,7 @@ resources and dependencies. Plus a zillion other features.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -66,8 +68,7 @@ rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/maven-bundle-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
@@ -78,8 +79,7 @@ install -pm 644 pom.xml \
# 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}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
%post
@@ -88,9 +88,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -103,6 +100,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Wed Dec 15 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-7
+- BR/R felix-parent.
+
* Thu Sep 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-5
- Fix BuildRequires.
13 years, 4 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-6 tree:
On ppc64:
joda-time-1.6-3.tzdata2008i.el6.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
13 years, 5 months
[jetty] Do not require apache-commons-parent in order to not bring maven and friends.
by Alexander Kurtakov
commit dbb1170b8a49155f89d220ccf237e3d6c9c67ac2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Dec 14 16:17:40 2010 +0200
Do not require apache-commons-parent in order to not bring maven and friends.
jetty.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 961ad2e..d6049fb 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
Name: jetty
Version: 6.1.26
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@ -97,7 +97,6 @@ BuildRequires: derby
Requires: chkconfig
Requires: jpackage-utils >= 0:1.6
Requires: ant >= 0:1.6
-Requires: apache-commons-parent
Requires: apache-commons-el
Requires: apache-commons-logging
Requires: tomcat6-lib >= 6.0.26
@@ -375,6 +374,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Tue Dec 14 2010 Alexander Kurtakov <akurtako(a)redhat.com> 6.1.26-4
+- Do not require apache-commons-parent in order to not bring maven and friends.
+
* Wed Dec 01 2010 Jeff Johnston <jjohnstn(a)redhat.com> 6.1.26-3
- Resolves #655808
- Fix util pom to reference javax.servlet groupid for servlet-api.
13 years, 5 months
[maven-wagon] Add patch.
by Alexander Kurtakov
commit 7038d6812250712b700ffda121df8363b83ab628
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Dec 13 23:25:38 2010 +0200
Add patch.
disable-tck.patch | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/disable-tck.patch b/disable-tck.patch
new file mode 100644
index 0000000..cb90a22
--- /dev/null
+++ b/disable-tck.patch
@@ -0,0 +1,11 @@
+--- pom.xml.sav 2010-11-13 23:20:29.000000000 +0200
++++ pom.xml 2010-12-13 19:10:47.319780363 +0200
+@@ -163,7 +163,7 @@ under the License.
+ <module>wagon-provider-api</module>
+ <module>wagon-providers</module>
+ <module>wagon-provider-test</module>
+- <module>wagon-tcks</module>
++ <!--module>wagon-tcks</module-->
+ </modules>
+
+ <properties>
13 years, 5 months
[maven-wagon] New sources file.
by Alexander Kurtakov
commit 8c3a3040856bd2fe56d599ae8d849761b879e639
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Dec 13 22:46:41 2010 +0200
New sources file.
sources | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/sources b/sources
index a4990ef..7160ddb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
9dc49550f70e1e4e4872ae0c95b5abcc wagon-1.0-beta-6-src.tar.gz
+0db197aca326d151d4ca8fda2564a80a wagon-1.0-beta-7-src.tar.xz
13 years, 5 months
[maven-wagon] Update to beta 7.
by Alexander Kurtakov
commit 73724c609e4d8998880da6d1172fc304a8839886
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Dec 13 22:33:49 2010 +0200
Update to beta 7.
Adapt to current guidelines.
Fix pom names.
maven-wagon.spec | 69 +++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 42 deletions(-)
---
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 26f37d4..7f92b5c 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -29,7 +29,7 @@
#
%global bname wagon
-%global blevel beta-6
+%global blevel beta-7
# FIXME1: wagon-scm has been disabled for now due to maven-scm dependency
# FIXME2: haltOnFailure/Error has been set to false for
@@ -37,19 +37,20 @@
Name: maven-%{bname}
Version: 1.0
-Release: 0.2.b6.3%{?dist}
+Release: 0.2.b7.1%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
Group: Development/Java
URL: http://maven.apache.org/wagon
-Source0: wagon-1.0-%{blevel}-src.tar.gz
-# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-6/
-# tar czvf wagon-1.0-beta-6-src.tar.gz wagon-1.0-beta-6
+Source0: wagon-1.0-%{blevel}-src.tar.xz
+# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-7/
+# tar caf wagon-1.0-beta-7-src.tar.xz wagon-1.0-beta-7
Source1: wagon-1.0-jpp-depmap.xml
#patch for 1.0 beta-6
Patch0: wagon-http-shared-pom_xml.patch
+Patch1: disable-tck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,6 +136,7 @@ Documents for %{name}.
sed -i "s|<module>wagon-webdav-jackrabbit</module>|<!-- <module>wagon-webdav-jackrabbit</module> -->|" wagon-providers/pom.xml
%patch0 -b .sav
+%patch1
# To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -164,91 +166,76 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 \
wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-provider-api %{version} JPP/%{name} provider-api
install -m 644 \
wagon-providers/wagon-file/target/wagon-file-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/file-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/file.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-file %{version} JPP/%{name} file
install -m 644 \
wagon-providers/wagon-ftp/target/wagon-ftp-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ftp %{version} JPP/%{name} ftp
install -m 644 \
wagon-providers/wagon-http/target/wagon-http-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/http-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/http.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-http %{version} JPP/%{name} http
install -m 644 \
wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-http-lightweight %{version} JPP/%{name} http-lightweight
install -m 644 \
wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
install -m 644 \
wagon-providers/wagon-scm/target/wagon-scm-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/scm-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/scm.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-scm %{version} JPP/%{name} scm
install -m 644 \
wagon-providers/wagon-ssh/target/wagon-ssh-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ssh %{version} JPP/%{name} ssh
install -m 644 \
wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
install -m 644 \
wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
install -m 644 \
wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
#Until webdav is available, map it to an empty dep
#install -m 644 \
# wagon-providers/wagon-webdav-jackrabbit/target/wagon-webdav-jackrabbit-%{version}-%{blevel}.jar \
# $RPM_BUILD_ROOT%{_javadir}/%{name}/web-jackrabbit-%{version}.jar
-#%add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit %{version} JPP/%{name} webdav-jackrabbit
-%add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit %{version} JPP/maven2 empty-dep
-
-
-# no wagon-ssh-ganymed in beta 6
-#install -m 644 \
-# wagon-providers/wagon-ssh-ganymed/target/wagon-ssh-ganymed-%{version}-%{blevel}.jar \
-# $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-ganymed-%{version}.jar
-#%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-ganymed %{version} JPP/%{name} ssh-ganymed
+#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit %{version} JPP/%{name} webdav-jackrabbit
#install -m 644 \
# wagon-providers/wagon-webdav/target/wagon-webdav-%{version}-%{blevel}.jar \
# $RPM_BUILD_ROOT%{_javadir}/%{name}/webdav-%{version}.jar
#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
-
-# Until webdav is available, map it to an empty dep
-# no wagon-webdav in beta 6
-#%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/maven2 empty-dep
-
install -m 644 \
wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml \
@@ -277,17 +264,14 @@ install -m 644 wagon-providers/wagon-ssh-common-test/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-common-test.pom
install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-external.pom
-#install -m 644 wagon-providers/wagon-ssh-ganymed/pom.xml \
-# $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-ganymed.pom
install -m 644 wagon-providers/wagon-ssh/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh.pom
#install -m 644 wagon-providers/wagon-webdav/pom.xml \
# $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-webdav.pom
# 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}
# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -300,9 +284,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
@@ -317,7 +298,6 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%files manual
@@ -325,6 +305,11 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.2.b7.1
+- Update to beta 7.
+- Adapt to current guidelines.
+- Fix pom names.
+
* Thu Sep 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.2.b6.3
- Use javadoc:aggregate.
- Drop ant build.
13 years, 5 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-6 tree:
On ppc64:
joda-time-1.6-3.tzdata2008i.el6.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
13 years, 5 months