diff --git a/.gitignore b/.gitignore index 3147e1c..46f7c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jansi-1.6.tar.xz +/jansi-1.9.tar.xz diff --git a/jansi-1.6-pom.patch b/jansi-1.6-pom.patch deleted file mode 100644 index 14e6c51..0000000 --- a/jansi-1.6-pom.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur jansi-1.6/jansi/pom.xml jansi-1.6-work/jansi/pom.xml ---- jansi-1.6/jansi/pom.xml 2011-06-19 10:51:32.000000000 -0400 -+++ jansi-1.6-work/jansi/pom.xml 2011-08-25 08:24:42.950756822 -0400 -@@ -94,19 +94,6 @@ - 2.3 - - -- -- -- org.fusesource.mvnplugins -- maven-uberize-plugin -- 1.5 -- -- -- package -- uberize -- -- -- -- - - org.apache.maven.plugins - maven-surefire-plugin -diff -Naur jansi-1.6/pom.xml jansi-1.6-work/pom.xml ---- jansi-1.6/pom.xml 2011-06-19 10:51:32.000000000 -0400 -+++ jansi-1.6-work/pom.xml 2011-08-25 08:25:51.005754781 -0400 -@@ -132,6 +132,5 @@ - - - jansi -- jansi-website - - diff --git a/jansi.spec b/jansi.spec index 0804c98..dbe57d5 100644 --- a/jansi.spec +++ b/jansi.spec @@ -1,15 +1,14 @@ Name: jansi -Version: 1.6 -Release: 4%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: Jansi is a java library for generating and interpreting ANSI escape sequences Group: Development/Libraries License: ASL 2.0 URL: http://jansi.fusesource.org/ # git clone git://github.com/fusesource/jansi.git -# cd jansi && git archive --format=tar --prefix=jansi-1.6/ jansi-project-1.6 | xz > jansi-1.6.tar.xz -Source0: %{name}-%{version}.tar.xz -Patch0: %{name}-%{version}-pom.patch +# cd jansi && git archive --format=tar --prefix=jansi-1.9/ jansi-project-1.9 | xz > jansi-1.9.tar.xz +Source0: jansi-%{version}.tar.xz BuildArch: noarch @@ -50,7 +49,15 @@ This package contains the API documentation for %{name}. %prep %setup -q -%patch0 -p1 + +%pom_disable_module jansi-website +%pom_xpath_remove "pom:build/pom:extensions" + +# No org.fusesource.mvnplugins:fuse-javadoc-skin available +%pom_remove_plugin "org.apache.maven.plugins:maven-dependency-plugin" + +# No maven-uberize-plugin +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-uberize-plugin']" jansi/pom.xml %build mvn-rpmbuild install javadoc:aggregate @@ -84,6 +91,9 @@ install -pm 644 %{name}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %doc license.txt %changelog +* Tue Oct 09 2012 Marek Goldmann - 1.9-1 +- Upstream release 1.9, RHBZ#864490 + * Thu Jul 19 2012 Fedora Release Engineering - 1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 47de318..59c3332 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90a600f1c5643058c28abce308afc1ee jansi-1.6.tar.xz +6870d6d2b35a429b3127b27fa1644ce7 jansi-1.9.tar.xz