[jgoodies-animation] Update to upstream version 1.4.3

Michael Šimáček msimacek at fedoraproject.org
Mon Feb 16 21:28:42 UTC 2015


commit df41bf6a67ecd901058dad82c13b886b1ac92ffb
Author: Michael Simacek <msimacek at redhat.com>
Date:   Mon Feb 16 22:27:52 2015 +0100

    Update to upstream version 1.4.3

 .gitignore              |    1 +
 jgoodies-animation.spec |   58 ++++++++++++++--------------------------------
 sources                 |    2 +-
 3 files changed, 20 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c8b5e4a..4007352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jgoodies-animation-1_3_0.zip
+/jgoodies-animation-1_4_3.zip
diff --git a/jgoodies-animation.spec b/jgoodies-animation.spec
index dc55be4..27417f5 100644
--- a/jgoodies-animation.spec
+++ b/jgoodies-animation.spec
@@ -1,25 +1,19 @@
 Name:          jgoodies-animation
-Version:       1.3.0
-Release:       5%{?dist}
+Version:       1.4.3
+Release:       1%{?dist}
 Summary:       Framework for time-based real-time animations in Java
-Group:         Development/Java
 License:       BSD
 #Alt. URL:     http://java.net/projects/animation
 URL:           http://www.jgoodies.com/freeware/animation/index.html
 
 Source0:       http://www.jgoodies.com/download/libraries/animation/%{name}-%(tr "." "_" <<<%{version}).zip
-Source1:       %{name}-%{version}.pom
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
-BuildRequires: ant
-BuildRequires: jpackage-utils
-BuildRequires: jgoodies-common
-
-Requires:      java
-Requires:      jpackage-utils
-Requires:      jgoodies-common
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.jgoodies:jgoodies-common)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 
 %description
@@ -33,9 +27,6 @@ Unlike SMIL we use Java to describe the animations – not XML.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -43,43 +34,30 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 
-# Delete prebuilt JARs
+mkdir -p src/main/java
+(cd src/main/java && jar xf ../../../%{name}-%{version}-sources.jar)
+mkdir -p src/test/java
+(cd src/test/java && jar xf ../../../%{name}-%{version}-tests.jar)
 find -name "*.jar" -delete
 
-# Remove DOS line endings
-for file in LICENSE.txt RELEASE-NOTES.txt; do
-  sed 's|\r||g' $file > $file.new && \
-  touch -r $file $file.new && \
-  mv $file.new $file
-done
+sed -i 's|\r||g' LICENSE.txt RELEASE-NOTES.txt
 
 %build
-mkdir -p lib
-pushd lib
-ln -sf $(build-classpath jgoodies-common) jgoodies-common-1.2.1.jar
-popd
-%ant jar javadoc
+%mvn_build
 
 %install
-install -Dpm 0644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}/
-cp -a build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install
 
-install -Dm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt README.html RELEASE-NOTES.txt
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Mon Feb 16 2015 Michael Simacek <msimacek at redhat.com> - 1.4.3-1
+- Update to upstream version 1.4.3
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 3c3a049..1cd95a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a258108dd199b57ce535a2455963b6c0  jgoodies-animation-1_3_0.zip
+396a57df79ec6fabd205b0733f67539d  jgoodies-animation-1_4_3.zip


More information about the scm-commits mailing list