Update to upstream version 1.16

This commit is contained in:
Michael Simacek 2017-06-15 10:46:10 +02:00
parent 5126c21c63
commit f14a0eaebb
3 changed files with 27 additions and 21 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/noarch /noarch
/.build-*.log /.build-*.log
/*.src.rpm /*.src.rpm
/jansi-project-1.16.tar.gz

View File

@ -1,13 +1,11 @@
Name: jansi Name: jansi
Version: 1.11 Version: 1.16
Release: 12%{?dist} Release: 1%{?dist}
Summary: Jansi is a java library for generating and interpreting ANSI escape sequences Summary: Jansi is a java library for generating and interpreting ANSI escape sequences
License: ASL 2.0 License: ASL 2.0
URL: http://jansi.fusesource.org/ URL: http://jansi.fusesource.org/
# git clone git://github.com/fusesource/jansi.git Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz
# cd jansi && git archive --format=tar --prefix=jansi-1.11/ jansi-project-1.11 | xz > jansi-1.11.tar.xz
Source0: jansi-%{version}.tar.xz
BuildArch: noarch BuildArch: noarch
@ -29,25 +27,30 @@ Summary: Javadocs for %{name}
This package contains the API documentation for %{name}. This package contains the API documentation for %{name}.
%prep %prep
%setup -q %setup -q -n jansi-jansi-project-%{version}
%pom_disable_module jansi-website %pom_disable_module example
%pom_xpath_remove "pom:build/pom:extensions" %pom_xpath_remove "pom:build/pom:extensions"
%pom_remove_plugin :maven-site-plugin %pom_remove_plugin -r :maven-site-plugin
# No org.fusesource.mvnplugins:fuse-javadoc-skin available
%pom_remove_plugin "org.apache.maven.plugins:maven-dependency-plugin"
# No maven-uberize-plugin # No maven-uberize-plugin
%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-uberize-plugin']" jansi/pom.xml %pom_remove_plugin -r :maven-uberize-plugin
# Remove unnecessary deps for jansi-native builds # Remove unnecessary deps for jansi-native builds
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId = 'jansi-native' and pom:classifier != '']" jansi/pom.xml pushd jansi
%pom_remove_dep :jansi-windows32
%pom_remove_dep :jansi-windows64
%pom_remove_dep :jansi-osx
%pom_remove_dep :jansi-freebsd32
%pom_remove_dep :jansi-freebsd64
# it's there only to be bundled in uberjar and we disable uberjar generation
%pom_remove_dep :jansi-linux32
%pom_remove_dep :jansi-linux64
popd
# javadoc generation fails due to strict doclint in JDK 8 # javadoc generation fails due to strict doclint in JDK 8
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin -r :maven-javadoc-plugin
%pom_remove_plugin :maven-javadoc-plugin jansi
%build %build
%mvn_build %mvn_build
@ -56,14 +59,16 @@ This package contains the API documentation for %{name}.
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%dir %{_javadir}/%{name} %license license.txt
%dir %{_mavenpomdir}/%{name} %doc readme.md changelog.md
%doc readme.md license.txt changelog.md
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc license.txt %license license.txt
%changelog %changelog
* Wed Jun 14 2017 Michael Simacek <msimacek@redhat.com> - 1.16-1
- Update to upstream version 1.16
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-12 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1 +1 @@
49986b208496fb74e48a706e67bffea7 jansi-1.11.tar.xz SHA512 (jansi-project-1.16.tar.gz) = 0226783ae6e254d8572bc92563f5c7fa635ba99c2311caa671848a6d93e97b00d2f529e0805b76d9e09665092d4606c0f13b6e9bb94ebecef6a50be442d4fa7f