[jnr-posix] Update to jnr-posix 3.0.1.

Michal Srb msrb at fedoraproject.org
Tue Jan 21 11:51:20 UTC 2014


commit 081c9fb1c992576dc20b0282d4face6ed7f62102
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Jan 21 10:40:09 2014 +0100

    Update to jnr-posix 3.0.1.
    
    Thanks Vít Ondruch

 .gitignore     |    1 +
 jnr-posix.spec |   67 ++++++++++++++-----------------------------------------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c4075d..de518e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /jruby-jnr-posix-1.1.7-0-g9555cb9.tar.gz
 /jnr-jnr-posix-1.1.8-0-g3035acd.tar.gz
 /jnr-jnr-posix-2.4.0-0-g47d9618.tar.gz
+/3.0.1.tar.gz
diff --git a/jnr-posix.spec b/jnr-posix.spec
index 83db698..96b7500 100644
--- a/jnr-posix.spec
+++ b/jnr-posix.spec
@@ -1,38 +1,15 @@
-%global commit_hash 47d9618
-%global tag_hash a69c89c
-
 Name:           jnr-posix
-Version:        2.4.0
-Release:        2%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        Java Posix layer
 Group:          Development/Libraries
 License:        CPL or GPLv2+ or LGPLv2+
 URL:            http://github.com/jnr/%{name}/
-Source0:        https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+Source0:        https://github.com/jnr/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
 BuildRequires:  jnr-constants
 BuildRequires:  jnr-ffi
-BuildRequires:  jffi
-BuildRequires:  objectweb-asm4
-
 BuildRequires:  maven-local
-BuildRequires:  maven-clean-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit4
-
-Requires:       java
-Requires:       jpackage-utils
-Requires:       jnr-constants
-Requires:       jnr-ffi
-Requires:       jffi
-Requires:       objectweb-asm4
 
 BuildArch:      noarch
 
@@ -48,39 +25,29 @@ Group:          Documentation
 Javadoc for %{name}.
 
 %prep
-%setup -q -n jnr-%{name}-%{tag_hash}
+%setup -q
 
-find ./ -name '*.jar' -delete
-find ./ -name '*.class' -delete
+# Remove useless wagon extension.
+%pom_xpath_remove "pom:build/pom:extensions"
+
+%mvn_file : %{name}
 
 %build
 # TODO: some tests still fail
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt README.txt
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*
 
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Oct 18 2013 Vít Ondruch <vondruch at redhat.com> - 3.0.1-1
+- Update to jnr-posix 3.0.1.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -105,10 +72,10 @@ install -pm 644 pom.xml  \
 * Thu Dec 02 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.1.4-3
 - updates to conform to pkg guidelines
 
-* Fri Sep 09 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.1.4-2
+* Thu Sep 09 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.1.4-2
 - build / include javadocs
 
-* Fri Sep 09 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.1.4-1
+* Thu Sep 09 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.1.4-1
 - bumped version to 1.1.4
 
 * Fri Jan 22 2010 Mohammed Morsi <mmorsi at redhat.com> - 1.0.8-1
diff --git a/sources b/sources
index 9c43873..34f0a57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16e1489b4d165a8a3c3df76ea0a41101  jnr-jnr-posix-2.4.0-0-g47d9618.tar.gz
+f49e46586433ddf781b3b83c90025f6f  3.0.1.tar.gz


More information about the scm-commits mailing list