[maven-javadoc-plugin] Add missing requires
by Mikolaj Izdebski
commit 050804c8027e940dc9a068659d956dd0e8ace7bc
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 20:05:40 2013 +0100
Add missing requires
- Resolves: rhbz#893166
maven-javadoc-plugin.spec | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 7e85efe..73fdc44 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -2,7 +2,7 @@
Name: maven-javadoc-plugin
Version: 2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Javadoc Plugin
Group: Development/Libraries
@@ -31,9 +31,32 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: maven-javadoc-plugin
%endif
-Requires: jpackage-utils
+Requires: java
+Requires: apache-commons-io
+Requires: apache-commons-lang
+Requires: apache-commons-logging
+Requires: jakarta-commons-httpclient
+Requires: log4j
Requires: maven
+Requires: maven-archiver
+Requires: maven-artifact
+Requires: maven-artifact-manager
+Requires: maven-common-artifact-filters
+Requires: maven-doxia-sink-api
+Requires: maven-doxia-sitetools
+Requires: maven-model
+Requires: maven-plugin-annotations
+Requires: maven-project
+Requires: maven-settings
Requires: maven-shared-invoker
+Requires: maven-shared-reporting-api
+Requires: maven-toolchain
+Requires: maven-wagon
+Requires: plexus-archiver
+Requires: plexus-containers-container-default
+Requires: plexus-interactivity
+Requires: plexus-utils
+Requires: qdox
BuildArch: noarch
@@ -109,6 +132,10 @@ rm -rf target/site/api*
%endif
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9-3
+- Add missing requires
+- Resolves: rhbz#893166
+
* Mon Nov 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.9-2
- Add LICENSE and NOTICE files to packages (#879605)
- Add dependency exclusion to make enforcer happy
11 years, 3 months
[plexus-component-factories-pom] Build with xmvn
by Mikolaj Izdebski
commit 9467ace2cf971ad074c4f10f8c4dda31dadf964a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 19:17:47 2013 +0100
Build with xmvn
plexus-component-factories-pom.spec | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/plexus-component-factories-pom.spec b/plexus-component-factories-pom.spec
index e70663d..86ffd0f 100644
--- a/plexus-component-factories-pom.spec
+++ b/plexus-component-factories-pom.spec
@@ -2,7 +2,7 @@
Name: plexus-component-factories-pom
Version: 1.0
-Release: 0.3.alpha11%{?dist}
+Release: 0.4.alpha11%{?dist}
Summary: Plexus Component Factories POM
BuildArch: noarch
Group: Development/Libraries
@@ -11,8 +11,7 @@ URL: http://plexus.codehaus.org/
Source0: http://repo1.maven.org/maven2/org/codehaus/plexus/%{artifactId}/%{version...
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-BuildRequires: jpackage-utils
-BuildRequires: maven
+BuildRequires: xmvn
%description
@@ -26,24 +25,20 @@ cp -p %{SOURCE1} LICENSE
%pom_xpath_remove pom:modules
-%check
-mvn-rpmbuild verify
+%build
+%mvn_alias : plexus:
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+%mvn_install
-# POM file
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# depmap
-%add_maven_depmap -a "plexus:%{artifactId}" JPP-%{name}.pom
-
-%files
+%files -f .mfiles
%doc LICENSE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0-0.4.alpha11
+- Build with xmvn
+
* Thu Dec 13 2012 Michal Srb <msrb(a)redhat.com> - 1.0-0.3.alpha11
- Fixed artifactId
11 years, 3 months
[plexus-root-pom] Build with xmvn
by Mikolaj Izdebski
commit 22c091719de66faa98946a26e2e3ac4fd06395a7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 19:10:47 2013 +0100
Build with xmvn
plexus-root-pom.spec | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/plexus-root-pom.spec b/plexus-root-pom.spec
index 876f972..9411bf6 100644
--- a/plexus-root-pom.spec
+++ b/plexus-root-pom.spec
@@ -1,6 +1,6 @@
Name: plexus-root-pom
Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plexus Root POM
BuildArch: noarch
Group: Development/Libraries
@@ -10,9 +10,7 @@ Source0: http://repo1.maven.org/maven2/plexus/plexus-root/%{version}/plexus-root
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: fix-non-parsable-xml.patch
-BuildRequires: jpackage-utils
-BuildRequires: maven
-
+BuildRequires: xmvn
%description
This package provides Plexus Root parent POM used by different
@@ -27,24 +25,19 @@ cp -p %{SOURCE1} LICENSE
%pom_xpath_remove pom:modules
-%check
-mvn-rpmbuild verify
+%build
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-
-# POM file
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
-# depmap
-%add_maven_depmap JPP-%{name}.pom
-
-%files
+%files -f .mfiles
%doc LICENSE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.3-3
+- Build with xmvn
+
* Tue Dec 11 2012 Michal Srb <msrb(a)redhat.com> - 1.0.3-2
- Use namespace in in pom_xpath_remove macro
- Use direct link in Source0
11 years, 3 months
[plexus-root-pom] Upload sources to lookaside cache
by Mikolaj Izdebski
commit f6eeb41d66db928976c83eae041ff5f1a57c8f5b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 19:08:37 2013 +0100
Upload sources to lookaside cache
.gitignore | 2 +
LICENSE-2.0.txt | 202 ---------------------------------------------
plexus-root-1.0.3.pom | 216 -------------------------------------------------
sources | 2 +
4 files changed, 4 insertions(+), 418 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..603c688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/plexus-root-1.0.3.pom
+/LICENSE-2.0.txt
diff --git a/sources b/sources
index e69de29..051bf7b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+9726dace89485f33400902f55a03619e plexus-root-1.0.3.pom
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
11 years, 3 months
[apache-commons-io] Build with xmvn
by Mikolaj Izdebski
commit f72a8d9634c905060d4caf3502f935a8351ee2ff
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 17:09:57 2013 +0100
Build with xmvn
- Update to current packaging guidelines
apache-commons-io.spec | 83 +++++++++++++++++++-----------------------------
1 files changed, 33 insertions(+), 50 deletions(-)
---
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 1ecd3e5..c025250 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -1,28 +1,25 @@
%global base_name io
%global short_name commons-%{base_name}
-Name: apache-%{short_name}
-Version: 2.4
-Release: 3%{?dist}
-Epoch: 1
-Summary: Utilities to assist with developing IO functionality
-License: ASL 2.0
-Group: Development/Libraries
-URL: http://commons.apache.org/%{base_name}
-Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: junit4
-BuildRequires: maven
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: apache-commons-parent
-
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} < %{epoch}:%{version}-%{release}
+Name: apache-%{short_name}
+Version: 2.4
+Release: 4%{?dist}
+Epoch: 1
+Summary: Utilities to assist with developing IO functionality
+License: ASL 2.0
+Group: Development/Libraries
+URL: http://commons.apache.org/%{base_name}
+Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6
+BuildRequires: xmvn >= 0.2.1
+BuildRequires: javapackages-tools >= 0.10.0
+BuildRequires: apache-commons-parent
+BuildRequires: maven-surefire-provider-junit
+
+Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: jakarta-%{short_name} < %{epoch}:%{version}-%{release}
%description
Commons-IO contains utility classes, stream implementations,
@@ -30,50 +27,36 @@ file filters, and endian classes. It is a library of utilities
to assist with developing IO functionality.
%package javadoc
-Summary: API documentation for %{name}
-Group: Documentation
-Requires: jpackage-utils
-Provides: jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes: jakarta-%{short_name}-javadoc < %{epoch}:%{version}-%{release}
+Summary: API documentation for %{name}
+Group: Documentation
+Provides: jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
+Obsoletes: jakarta-%{short_name}-javadoc < %{epoch}:%{version}-%{release}
%description javadoc
-This package contains the API documentation for %{name}.
+This package provides %{summary}.
%prep
%setup -q -n %{short_name}-%{version}-src
sed -i 's/\r//' *.txt
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_file : %{short_name} %{name}
+%mvn_alias : org.apache.commons:
+%mvn_build
%install
+%mvn_install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-io"
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:2.4-4
+- Build with xmvn
+
* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:2.4-3
- Add Provides/Obsoletes for jakarta-commons-io
11 years, 3 months