[joda-convert] Update to upstream version 1.6

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Feb 10 08:13:14 UTC 2014


commit efe1c2a7d4c7af5763c6541f93f1687aeb996a07
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Feb 10 09:11:28 2014 +0100

    Update to upstream version 1.6

 .gitignore        |    1 +
 joda-convert.spec |   39 ++++++++++++++-------------------------
 sources           |    2 +-
 3 files changed, 16 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c162e6..1734a6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /joda-convert-1.2.tar.gz
 /joda-convert-1.3.tar.gz
 /v1.3.1.tar.gz
+/joda-convert-1.6.tar.gz
diff --git a/joda-convert.spec b/joda-convert.spec
index 1420d23..6872f7c 100644
--- a/joda-convert.spec
+++ b/joda-convert.spec
@@ -1,49 +1,35 @@
 Name:           joda-convert
-Version:        1.3.1
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Java library for conversion to and from standard string formats
-
-Group:          Development/Libraries
 License:        ASL 2.0 
-
 URL:            https://github.com/JodaOrg/joda-convert/
-Source0:        https://github.com/JodaOrg/joda-convert/archive/v%{version}.tar.gz
-
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
-BuildRequires:  maven-local
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-release-plugin
-BuildRequires:  maven-changes-plugin
-BuildRequires:  maven-project-info-reports-plugin
-BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  dos2unix
+Source0:        https://github.com/JodaOrg/joda-convert/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Requires:       jpackage-utils
-Requires:       java
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-checkstyle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 
 %description
 Java library to enable conversion to and from standard string formats.
 
 %package javadoc
-Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-This package contains the API documentation for %{name}.
+This package contains the %{summary}.
 
 %prep
 %setup -q
 %mvn_file : %{name}
+sed -i s/
// *.txt
 
 %build
 %mvn_build
-for x in LICENSE.txt NOTICE.txt RELEASE-NOTES.txt; do
-    dos2unix $x
-done
 
 %install
 %mvn_install
@@ -55,6 +41,9 @@ done
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Feb 10 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6-1
+- Update to upstream version 1.6
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e5fd3b..f4386b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b522e205efd46547b2d55c057733c90b  v1.3.1.tar.gz
+bad95e15dc34a710dc4d117c206ec512  joda-convert-1.6.tar.gz


More information about the scm-commits mailing list