[jpanoramamaker/f20] updated to upstream 5.6, resolves rhbz#1022124

[jiri vanek]

commit 27c6087c2e61df85ccc4e5d78c564e91069f9792
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Fri Nov 29 19:09:48 2013 +0100

    updated to upstream 5.6, resolves rhbz#1022124

 .gitignore          |    1 +
 jpanoramamaker.spec |   21 +++++++++++----------
 sources             |    2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7469036..0affd0d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /jpanoramamaker-5.3.src.tar.gz
 /jpanoramamaker-5.4.src.tar.gz
 /jpanoramamaker-5.5.src.tar.gz
+/jpanoramamaker-5.6.src.tar.gz
diff --git a/jpanoramamaker.spec b/jpanoramamaker.spec
index c8fdb90..e970137 100644
--- a/jpanoramamaker.spec
+++ b/jpanoramamaker.spec
@@ -1,5 +1,8 @@
+%global majorv 5
+%global minorv 6
+
 Name:           jpanoramamaker
-Version:        5.5
+Version:        %{majorv}.%{minorv}
 Release:        1%{?dist}
 Summary:        Tool for stitching photos to panorama in linear curved space
 BuildArch:      noarch
@@ -8,8 +11,7 @@ BuildArch:      noarch
 Group:          Amusements/Graphics
 License:        BSD
 URL:            http://jpanoramamaker.wz.cz
-Source0:        http://jpanoramamaker.wz.cz/fedora/%{name}-5.5.src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://jpanoramamaker.wz.cz/fedora/%{name}-%{version}.src.tar.gz
 
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
@@ -36,7 +38,7 @@ This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-5
+%setup -q -n %{name}-%{majorv}
 
 
 find -name '*.class' -exec rm -f '{}' \;
@@ -45,11 +47,6 @@ find -name '*.jar' -exec rm -f '{}' \;
 %build
 ant
 
-#at this time the only existing test is executing and killing whole app.
-#DISPLAY=:0.0
-#export DISPLAY
-#ant run-test-with-main
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,7 +66,7 @@ cp -p ./jpanoramamaker $RPM_BUILD_ROOT%{_bindir}/jpanoramamaker
 
 # we are in /BUILD/jpanoramamaker-5/
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p ./dist/%{name}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p ./dist/%{name}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -103,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 29 2013 Jiri Vanek <jvanek at redhat.com> - 5.6-1
+- updted to upstream 5.6
+- removed versioned jar (resolves rhbz#1022124)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 6461e6f..ff3a77b 100755
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79ce27b427bd41a385cb56ac948e1a89  jpanoramamaker-5.5.src.tar.gz
+4ee434ca39d09835c45e0f876dfa7438  jpanoramamaker-5.6.src.tar.gz