Upstream release 1.9, RHBZ#864490

This commit is contained in:
Marek Goldmann 2012-10-09 15:46:12 +02:00
parent e90dac4287
commit f4bc0f1331
4 changed files with 18 additions and 40 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/jansi-1.6.tar.xz
/jansi-1.9.tar.xz

View File

@ -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 @@
<version>2.3</version>
</plugin>
- <!-- include all the dependencies into the jar so it can run standalone -->
- <plugin>
- <groupId>org.fusesource.mvnplugins</groupId>
- <artifactId>maven-uberize-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>uberize</goal></goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
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 @@
<modules>
<module>jansi</module>
- <module>jansi-website</module>
</modules>
</project>

View File

@ -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 <mgoldman@redhat.com> - 1.9-1
- Upstream release 1.9, RHBZ#864490
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1 +1 @@
90a600f1c5643058c28abce308afc1ee jansi-1.6.tar.xz
6870d6d2b35a429b3127b27fa1644ce7 jansi-1.9.tar.xz