[classmate] update to 1.1.0
gil
gil at fedoraproject.org
Sun Feb 15 23:39:45 UTC 2015
commit 92e62e8206f5de35aaecdb3c45f8dcc0f1367fdc
Author: gil <puntogil at libero.it>
Date: Mon Feb 16 00:39:28 2015 +0100
update to 1.1.0
.gitignore | 1 +
LICENSE-2.0.txt | 202 -------------------------------------------------------
classmate.spec | 35 +++++-----
sources | 2 +-
4 files changed, 19 insertions(+), 221 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13da19c..b77bd28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/classmate-0.5.4.tar.xz
/classmate-0.8.0.tar.gz
+/classmate-1.1.0.tar.gz
diff --git a/classmate.spec b/classmate.spec
index 13ad224..3f650c1 100644
--- a/classmate.spec
+++ b/classmate.spec
@@ -1,22 +1,16 @@
Name: classmate
-Version: 0.8.0
-Release: 6%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Java introspection library
License: ASL 2.0
Url: http://github.com/cowtowncoder/java-classmate/
Source0: https://github.com/cowtowncoder/java-classmate/archive/%{name}-%{version}.tar.gz
-# classmate package don't include the license file
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-
-BuildRequires: java-devel
-BuildRequires: sonatype-oss-parent
BuildRequires: junit
-
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-source-plugin
+BuildRequires: sonatype-oss-parent
BuildArch: noarch
@@ -36,13 +30,15 @@ This package contains javadoc for %{name}.
find . -name "*.class" -delete
find . -name "*.jar" -delete
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
+%pom_remove_plugin :maven-source-plugin
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions"
+
+sed -i 's/\r//' src/main/resources/META-INF/LICENSE src/main/resources/META-INF/NOTICE
+cp -p src/main/resources/META-INF/LICENSE .
+cp -p src/main/resources/META-INF/NOTICE .
-# these test fails junit.framework.AssertionFailedError: expected:<X> but was:<Y>
-rm -r src/test/java/com/fasterxml/classmate/TestReadme.java \
- src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java \
- src/test/java/com/fasterxml/classmate/AnnotationsTest.java
+# this test fails junit.framework.AssertionFailedError: expected:<X> but was:<Y>
+rm -r src/test/java/com/fasterxml/classmate/AnnotationsTest.java
%mvn_file :%{name} %{name}
@@ -54,13 +50,16 @@ rm -r src/test/java/com/fasterxml/classmate/TestReadme.java \
%mvn_install
%files -f .mfiles
-%doc README.md release-notes.txt
-%license LICENSE-2.0.txt
+%doc README.md VERSION.txt
+%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
-%license LICENSE-2.0.txt
+%license LICENSE NOTICE
%changelog
+* Sun Feb 15 2015 gil cattaneo <puntogil at libero.it> 1.1.0-1
+- update to 1.1.0
+
* Fri Jan 30 2015 gil cattaneo <puntogil at libero.it> 0.8.0-6
- introduce license macro
diff --git a/sources b/sources
index 52cf832..4858bb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1dbc4b17855af35598b4be1b056c4d35 classmate-0.8.0.tar.gz
+ee4d200f898bca07fb59ecd9baa6b8e7 classmate-1.1.0.tar.gz
More information about the scm-commits
mailing list