[jetty-version-maven-plugin] Add minimal maven version for BR
by Stanislav Ochotnicky
commit 70969cdd9c3a6ea26a777e78382b4540b17d619d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 7 18:25:02 2011 +0100
Add minimal maven version for BR
.gitignore | 1 +
jetty-version-maven-plugin.spec | 76 +++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 78 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..088c2fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jetty-version-maven-plugin-1.0.7.tar.bz2
diff --git a/jetty-version-maven-plugin.spec b/jetty-version-maven-plugin.spec
new file mode 100644
index 0000000..65e7905
--- /dev/null
+++ b/jetty-version-maven-plugin.spec
@@ -0,0 +1,76 @@
+Name: jetty-version-maven-plugin
+Version: 1.0.7
+Release: 2%{?dist}
+Summary: Jetty version management Maven plugin
+
+Group: Development/Libraries
+License: ASL 2.0 or EPL
+URL: http://www.eclipse.org/jetty/
+Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.toolchain.git/snapshot/%...
+# rpmlint config file (fedpkg lint will use this)
+#Source1: .rpmlint
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: apache-commons-lang3
+BuildRequires: maven >= 3.0.3-14
+BuildRequires: maven-compiler-plugin
+BuildRequires: jetty-toolchain
+
+Requires: maven
+Requires: maven-project
+Requires: jpackage-utils
+Requires: jetty-toolchain
+Requires: apache-commons-lang3
+
+%description
+Jetty version management Maven plugin
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+
+%prep
+%setup -q
+
+%build
+pushd %{name}
+# skip tests because we don't have jetty-test-helper (yet)
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+
+%install
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+pushd %{name}
+install -pm 644 pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -Dp -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+popd
+
+
+%files
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_javadir}/%{name}.jar
+%{_mavendepmapfragdir}/%{name}
+
+%files javadoc
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Fri Nov 4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.7-2
+- Add minimal maven version for BR
+
+* Thu Nov 3 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.7-1
+- Initial version of the package
+
diff --git a/sources b/sources
index e69de29..84a56fe 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+67379d70261f9fd18b0bddac239dc956 jetty-version-maven-plugin-1.0.7.tar.bz2
12 years, 7 months
[maven-remote-resources-plugin] Add plexus-resources to Requires
by Stanislav Ochotnicky
commit c0f4384bf40bfb49b1aab5a5d5fc46aef3a641bd
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 7 17:21:59 2011 +0100
Add plexus-resources to Requires
maven-remote-resources-plugin.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 3704dfc..5d7635b 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-remote-resources-plugin
Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Remote Resources Plugin
Group: Development/Libraries
@@ -46,6 +46,7 @@ Requires: jpackage-utils
Requires: maven-wagon
Requires: maven-shared-artifact-resolver
Requires: maven-shared-downloader
+Requires: plexus-resources
Obsoletes: maven2-plugin-remote-resources <= 0:2.0.8
Provides: maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -102,6 +103,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Mon Nov 7 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2.1-3
+- Add plexus-resources to Requires
+
* Wed Sep 07 2011 Tomas Radej <tradej(a)redhat.com> - 1.2.1-2
- Added license files
12 years, 7 months
[apache-commons-discovery] Update to 0.5.
by Alexander Kurtakov
commit e735dc366d6a7c9de68f89f62bca726d296afccd
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Mon Nov 7 13:16:38 2011 +0200
Update to 0.5.
Build with maven and adapt to current guidelines.
.gitignore | 1 +
apache-commons-discovery.spec | 46 +++++++++++-----------------------------
sources | 2 +-
3 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 378e22f..795cbcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-discovery-0.4-src.tar.gz
+commons-discovery-0.5-src.tar.gz
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index 688be77..6b56f7a 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -1,10 +1,9 @@
-
%global base_name discovery
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 0.4
-Release: 6%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Epoch: 2
Summary: Apache Commons Discovery
License: ASL 2.0
@@ -15,14 +14,11 @@ Patch0: %{name}-addosgimanifest.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: ant
-BuildRequires: ant-nodeps
-BuildRequires: junit >= 0:3.7
+BuildRequires: maven
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: apache-commons-logging >= 1.1.1
Requires: apache-commons-logging >= 1.1.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
# This should go away with F-17
Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 1:0.4
@@ -50,46 +46,31 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:0.4
%patch0
%build
-ant \
- -Djunit.jar=%(find-jar junit) \
- -Dlogger.jar=%(find-jar commons-logging) \
- test.discovery dist
+mvn-rpmbuild install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; 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
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Mon Nov 7 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2:0.5-1
+- Update to 0.5 upstream release.
+- Build with maven.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:0.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -109,4 +90,3 @@ rm -rf $RPM_BUILD_ROOT
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.4-1
- Rename and cleanup of jakarta-commons-discovery
-
diff --git a/sources b/sources
index c452e46..1e6df81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1275ad4c6ce54b9323269e30dc42dd0e commons-discovery-0.4-src.tar.gz
+9222c64ae780df6301de7152b4e55874 commons-discovery-0.5-src.tar.gz
12 years, 7 months