Broken dependencies: httpcomponents-project
by Fedora Koji Build System
httpcomponents-project has broken dependencies in the rawhide tree:
On x86_64:
httpcomponents-project-4.1.1-1.fc15.noarch requires maven-site-plugin
On i386:
httpcomponents-project-4.1.1-1.fc15.noarch requires maven-site-plugin
Please resolve this as soon as possible.
13 years, 2 months
[maven-shade-plugin] Add jdependency also to Requires
by Stanislav Ochotnicky
commit 3322346d2e22113abef1ced16734b26b0160b14d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Jan 26 18:59:34 2011 +0100
Add jdependency also to Requires
maven-shade-plugin.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 194c49c..ea0aa05 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
@@ -8,7 +8,7 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.4
# tar caf maven-shade-plugin-1.4.tar.xz maven-shade-plugin-1.4
-Source0: %{name}-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.xz
Source1: %{name}.depmap
Patch1: pom.xml.maven-artifact-manager.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,8 +37,9 @@ Requires: ant-nodeps
Requires: maven2
Requires: jpackage-utils
Requires: java >= 1:1.6.0
+Requires: jdependency >= 0.6
Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-shade <= 0:2.0.8
Provides: maven2-plugin-shade = 1:%{version}-%{release}
@@ -121,6 +122,9 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 26 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.4-2
+- Add jdependency also to Requires
+
* Thu Oct 14 2010 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 1.4-1
- Update to 1.4
- Add BR on jdependency >= 0.6
13 years, 2 months
[maven-site-plugin] BR maven not maven2.
by Alexander Kurtakov
commit cbcc76dd02867b05ae3545f6015c9b5f463f0347
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 26 13:42:30 2011 +0200
BR maven not maven2.
maven-site-plugin.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 99652ee..c0c40f1 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -12,7 +12,7 @@ Patch0: add-servlet-dep.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: plexus-maven-plugin
13 years, 2 months
[maven-site-plugin] Update to new upstream version.
by Alexander Kurtakov
commit 808d9257cd4bbaba99dc32bd87f7cbe4a24bb3e5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 26 13:39:57 2011 +0200
Update to new upstream version.
.gitignore | 1 +
add-jetty-util.patch | 19 -------------------
add-servlet-dep.patch | 19 +++++++++++++++++++
maven-site-plugin.spec | 43 +++++++++++++++----------------------------
sources | 2 +-
5 files changed, 36 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 294e358..3f18684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-site-plugin-2.1.tar.xz
+maven-site-plugin-2.2-source-release.zip
diff --git a/add-servlet-dep.patch b/add-servlet-dep.patch
new file mode 100644
index 0000000..fb49e32
--- /dev/null
+++ b/add-servlet-dep.patch
@@ -0,0 +1,19 @@
+--- pom.xml.sav 2010-11-25 20:08:18.000000000 +0200
++++ pom.xml 2011-01-26 13:26:55.152418368 +0200
+@@ -351,6 +351,16 @@ under the License.
+ <artifactId>jetty</artifactId>
+ <version>6.1.5</version>
+ </dependency>
++ <dependency>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ <version>2.5</version>
++ </dependency>
++ <dependency>
++ <groupId>org.mortbay.jetty</groupId>
++ <artifactId>jetty-util</artifactId>
++ <version>6.1.24</version>
++ </dependency>
+
+ <!-- test -->
+ <dependency>
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 934d053..99652ee 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,34 +1,30 @@
Name: maven-site-plugin
-Version: 2.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Maven Site Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-site-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-2.1 maven-site-plugin-2.1
-#tar caf maven-site-plugin-2.1.tar.xz maven-site-plugin-2.1/
-Source0: %{name}-%{version}.tar.xz
-Patch0: remove-prereqs.patch
-Patch1: add-jetty-util.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: add-servlet-dep.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-assembly
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-assembly-plugin
BuildRequires: plexus-maven-plugin
BuildRequires: maven-compiler-plugin
-BuildRequires: maven2-plugin-install
+BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
@@ -41,7 +37,6 @@ Requires: maven-doxia-tools
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-
Provides: maven2-plugin-site = %{version}-%{release}
Obsoletes: maven2-plugin-site <= 0:2.0.8
@@ -56,31 +51,23 @@ Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
%patch0
-%patch1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp \
+mvn-local \
-e \
- -Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=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 org.apache.maven.plugins maven-site-plugin %{version} JPP maven-site-plugin
@@ -101,9 +88,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -116,6 +100,9 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-1
+- Update to new upstream version.
+
* Tue Jun 15 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.1-3
- Requires maven-doxia-tools.
diff --git a/sources b/sources
index 067f39f..61af61d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d59fd7ef4947a992a2b9b99f0f302eb2 maven-site-plugin-2.1.tar.xz
+7e323342e3a7298678cf1535a97a1253 maven-site-plugin-2.2-source-release.zip
13 years, 2 months
[maven-war-plugin] Build with maven 3.
by Alexander Kurtakov
commit 6f45adc6577a814f99159c2047124531f1902b19
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 26 13:08:45 2011 +0200
Build with maven 3.
Drop depmap and other non needed parts.
.gitignore | 1 +
maven-war-plugin-depmap.xml | 16 ---------------
maven-war-plugin.spec | 46 +++++++++++++-----------------------------
sources | 2 +-
4 files changed, 16 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4f5d11..ae598a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-war-plugin-2.1-beta-1.tgz
+maven-war-plugin-2.1.1-source-release.zip
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index 8df6cdc..43bfcae 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,18 +1,12 @@
-%global version 2.1-beta-1
Name: maven-war-plugin
Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven WAR Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-war-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-b... maven-war-plugin
-#tar czf maven-war-plugin-2.1-beta-1.tgz maven-war-plugin
-Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-war-plugin/2...
-Source1: %{name}-depmap.xml
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
@@ -20,7 +14,7 @@ BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-jar-plugin
@@ -28,16 +22,16 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-tools
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-shared-filtering
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-changes
-BuildRequires: maven2-plugin-invoker
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-changes-plugin
+BuildRequires: maven-invoker-plugin
# Others
BuildRequires: xstream
@@ -69,28 +63,15 @@ API documentation for %{name}.
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# The depmap is used by the mvn-jpp command to convert dependencies
-# to the locations and versions that are available (if needed)
-cp %{SOURCE1} %{name}-depmap.xml
-export MAVEN_DEPMAP=$(pwd)/%{name}-depmap.xml
-
-mvn-jpp \
- -e \
+mvn-local -e \
-Dmaven.test.skip=true \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file=${MAVEN_DEPMAP} \
-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 maven-war-plugin %{version} JPP maven-war-plugin
@@ -111,9 +92,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -126,6 +104,10 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Jan 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.1-2
+- Build with maven 3.
+- Drop depmap and other non needed parts.
+
* Sat Nov 20 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.1.1-1
- Update to new version.
diff --git a/sources b/sources
index d1c2205..b44744d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e0f89ca57b53c9e44542e655ff7aa89 maven-war-plugin-2.1-beta-1.tgz
+26aa9f34e40a832ece2c3bd7381c0b11 maven-war-plugin-2.1.1-source-release.zip
13 years, 2 months
[sonatype-oss-parent] Initial commit
by Stanislav Ochotnicky
commit d91aa28c448164b83505509258d1c2e51c17c71c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jan 25 13:01:58 2011 +0100
Initial commit
.gitignore | 1 +
sonatype-oss-parent.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6cd1bd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/sonatype-oss-parent-6.tar.gz
diff --git a/sonatype-oss-parent.spec b/sonatype-oss-parent.spec
new file mode 100644
index 0000000..0d23ad7
--- /dev/null
+++ b/sonatype-oss-parent.spec
@@ -0,0 +1,57 @@
+%global artifactid oss-parent
+
+Name: sonatype-oss-parent
+Version: 6
+Release: 1%{?dist}
+Summary: Sonatype OSS Parent
+
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://svn.sonatype.org/spice/tags/oss-parent-6
+#svn export http://svn.sonatype.org/spice/tags/oss-parent-6 sonatype-oss-parent-6
+#tar zcf sonatype-oss-parent-6.tar.gz sonatype-oss-parent-6/
+Source0: %{name}-%{version}.tar.gz
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils >= 0:1.7.2
+
+Requires: jpackage-utils
+Requires: maven-release-plugin
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
+
+%description
+Sonatype OSS parent pom used by other sonatype packages
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+#nothing to do for the pom
+
+%install
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_to_maven_depmap org.sonatype.oss %{artifactid} %{version} JPP %{name}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%changelog
+* Thu Jan 20 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 6-1
+- Update to latest version that includes the license header
+
+* Wed Dec 1 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 5-1
+- Initial version of the package
diff --git a/sources b/sources
index e69de29..97d1a40 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ad217f2ff32d6a76c6287a47dbf5a7d6 sonatype-oss-parent-6.tar.gz
13 years, 2 months