Update to 2.0.6
- Remove obsolete patches - Use maven 3 to build
This commit is contained in:
parent
718e555600
commit
c4b2e36281
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/plexus-utils-2.0.6.tar.bz2
|
@ -1,16 +0,0 @@
|
|||||||
--- plexus-utils-2.0.5/pom.xml.orig 2010-05-05 10:35:10.289442289 +0100
|
|
||||||
+++ plexus-utils-2.0.5/pom.xml 2010-05-05 10:35:37.167378010 +0100
|
|
||||||
@@ -76,13 +76,6 @@
|
|
||||||
</systemProperties>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
- <plugin>
|
|
||||||
- <groupId>org.apache.maven.plugins</groupId>
|
|
||||||
- <artifactId>maven-release-plugin</artifactId>
|
|
||||||
- <configuration>
|
|
||||||
- <tagBase>https://svn.codehaus.org/plexus/plexus-utils/tags/</tagBase>
|
|
||||||
- </configuration>
|
|
||||||
- </plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
@ -28,19 +28,19 @@
|
|||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
%define parent plexus
|
%global parent plexus
|
||||||
%define subname utils
|
%global subname utils
|
||||||
|
|
||||||
Name: plexus-utils
|
Name: plexus-utils
|
||||||
Version: 2.0.5
|
Version: 2.0.6
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Plexus Common Utilities
|
Summary: Plexus Common Utilities
|
||||||
License: ASL 1.1 and ASL 2.0 and MIT
|
License: ASL 1.1 and ASL 2.0 and MIT
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://plexus.codehaus.org/
|
URL: http://plexus.codehaus.org/
|
||||||
Source0: plexus-utils-%{version}.tar.gz
|
# git clone git://github.com/sonatype/sisu
|
||||||
# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.1/
|
# git archive --prefix="plexus-utils-2.0.6/" --format=tar plexus-utils-2.0.6 | bzip2 > plexus-utils-2.0.6.tar.bz2
|
||||||
Patch0: plexus-utils-remove-release-plugin.patch
|
Source0: plexus-utils-%{version}.tar.bz2
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: jpackage-utils >= 0:1.6
|
BuildRequires: jpackage-utils >= 0:1.6
|
||||||
@ -79,15 +79,9 @@ Javadoc for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
mvn-rpmbuild install javadoc:javadoc
|
||||||
mkdir -p $MAVEN_REPO_LOCAL
|
|
||||||
|
|
||||||
mvn-jpp \
|
|
||||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
|
||||||
install javadoc:javadoc
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jars
|
# jars
|
||||||
@ -129,6 +123,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
|||||||
%doc %{_javadocdir}/%{name}
|
%doc %{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0.6-1
|
||||||
|
- Update to 2.0.6
|
||||||
|
- Remove obsolete patches
|
||||||
|
- Use maven 3 to build
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-3
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user