From e6f07cdf2d039b81717a2b39ffbbd6198c59dce0 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 17 Mar 2015 19:03:43 +0100 Subject: [PATCH] update to 1.6 --- .gitignore | 1 + replacer.spec | 48 +++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index f7a3f34..6c8bba8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /replacer-1.5.2-src-svn.tar.gz /replacer-1.5.3.tar.xz +/1.6.tar.gz diff --git a/replacer.spec b/replacer.spec index 051f456..356e585 100644 --- a/replacer.spec +++ b/replacer.spec @@ -1,27 +1,24 @@ Name: replacer -Version: 1.5.3 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Replacer Maven Mojo License: MIT -URL: http://code.google.com/p/maven-replacer-plugin/ -# svn export http://maven-replacer-plugin.googlecode.com/svn/tags/replacer-1.5.3/trunk/ replacer-1.5.3 -# tar cJf replacer-1.5.3.tar.xz replacer-1.5.3 -Source0: %{name}-%{version}.tar.xz -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(xerces:xercesImpl) - -# test deps -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.hamcrest:hamcrest-all) -BuildRequires: mvn(org.mockito:mockito-all) -BuildRequires: mvn(xml-apis:xml-apis) +URL: https://github.com/beiliubei/maven-replacer-plugin +# http://code.google.com/p/maven-replacer-plugin/ +Source0: https://github.com/beiliubei/maven-replacer-plugin/archive/%{version}.tar.gz BuildRequires: maven-local -BuildRequires: maven-plugin-plugin +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.hamcrest:hamcrest-all) +BuildRequires: mvn(org.mockito:mockito-all) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(xerces:xercesImpl) +BuildRequires: mvn(xml-apis:xml-apis) BuildArch: noarch @@ -38,14 +35,14 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q +%setup -q -n maven-replacer-plugin-%{version} %pom_remove_plugin :dashboard-maven-plugin +%pom_remove_plugin :maven-assembly-plugin # NoClassDefFoundError: org/w3c/dom/ElementTraversal %pom_add_dep xml-apis:xml-apis::test sed -i.hamcrest '/startsWith/d' src/test/java/com/google/code/maven_replacer_plugin/file/FileUtilsTest.java -sed -i 's/\r//' LICENSE.txt %mvn_file :%{name} %{name} %mvn_alias :%{name} com.google.code.maven-replacer-plugin:maven-replacer-plugin @@ -58,12 +55,17 @@ sed -i 's/\r//' LICENSE.txt %mvn_install %files -f .mfiles -%license LICENSE.txt +%doc README.md +%license LICENSE %files javadoc -f .mfiles-javadoc -%license LICENSE.txt +%license LICENSE %changelog +* Tue Mar 17 2015 gil cattaneo 1.6-1 +- update to 1.6 +- fix Url tag and Source0 tag + * Wed Feb 11 2015 gil cattaneo 1.5.3-2 - introduce license macro diff --git a/sources b/sources index ae3ac4e..cdb5868 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b2c59cae88b027223274bf2ab3ee9c6 replacer-1.5.3.tar.xz +fd3504b890f62e583db4182b09dad5be 1.6.tar.gz