From cca8ab1e4d856e571d2829135f357995a2627dbf76e230b9039923f6afbee1e3 Mon Sep 17 00:00:00 2001
From: Dmitry Roshchin <dmitry@roshchin.org>
Date: Sun, 23 Dec 2012 18:44:49 +0000
Subject: [PATCH] - Remove _service for downloading files - Use ImageMagick for
 icon converting - Update to version 1.47g   * see included release-notes.html

OBS-URL: https://build.opensuse.org/package/show/science/imagej?expand=0&rev=2
---
 _service                               |  3 ---
 _service:download_files:ij147c-src.zip |  3 ---
 ij147g-src.zip                         |  3 +++
 imagej.changes                         | 10 +++++++++-
 imagej.png                             |  3 ---
 imagej.spec                            | 15 +++++++--------
 6 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _service:download_files:ij147c-src.zip
 create mode 100644 ij147g-src.zip
 delete mode 100644 imagej.png

diff --git a/_service b/_service
deleted file mode 100644
index 76828d7..0000000
--- a/_service
+++ /dev/null
@@ -1,3 +0,0 @@
-<services>
-  <service name="download_files"/>
-</services>
\ No newline at end of file
diff --git a/_service:download_files:ij147c-src.zip b/_service:download_files:ij147c-src.zip
deleted file mode 100644
index 79209e9..0000000
--- a/_service:download_files:ij147c-src.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d4c92ad0b15ecb3401e4425a14986e395b2436425430c4b26722170b03cdea9
-size 1400116
diff --git a/ij147g-src.zip b/ij147g-src.zip
new file mode 100644
index 0000000..2b60fe1
--- /dev/null
+++ b/ij147g-src.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eeced1216d944a9e719beeac5cf951810264db51f1f399d3820b7c5ea71fa99e
+size 1411722
diff --git a/imagej.changes b/imagej.changes
index dc9efa1..409a8da 100644
--- a/imagej.changes
+++ b/imagej.changes
@@ -1,9 +1,17 @@
+-------------------------------------------------------------------
+Sun Dec 23 18:21:46 UTC 2012 - dmitry_r@opensuse.org
+
+- Remove _service for downloading files
+- Use ImageMagick for icon converting
+- Update to version 1.47g
+  * see included release-notes.html
+
 -------------------------------------------------------------------
 Fri Sep 14 06:53:45 UTC 2012 - lumnis@opensuse.org
 - startup script fix (in spec file) 
 
 -------------------------------------------------------------------
-Thu Sep 13 15:28:52 UTC 2012 - dmitry@roshchin.org
+Thu Sep 13 15:28:52 UTC 2012 - dmitry_r@opensuse.org
 
 - Various spec file cleanups
 
diff --git a/imagej.png b/imagej.png
deleted file mode 100644
index a20d866..0000000
--- a/imagej.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5be66ee6ea571de4349261582f8f474a9de1e9d0e53b8113172e03b7b48f6f0f
-size 323
diff --git a/imagej.spec b/imagej.spec
index 7db5e42..2914bf8 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package ImageJ
+# spec file for package imagej
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -14,10 +14,10 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
-%define SrcVersion 147c
+%define SrcVersion 147g
 
 Name:           imagej
-Version:        1.47
+Version:        1.47g
 Release:        0
 License:        SUSE-Public-Domain
 Summary:        Public domain Java image processing program
@@ -26,10 +26,9 @@ Group:          Productivity/Graphics/Convertors
 Source:         http://rsbweb.nih.gov/ij/download/src/ij%{SrcVersion}-src.zip
 Source1:        %{name}.in
 Source2:        %{name}.desktop
-Source3:        %{name}.png
 BuildRequires:  ant
-#BuildRequires: convert
 BuildRequires:  java-devel
+BuildRequires:  ImageMagick
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 Requires:       java >= 1.6.0
@@ -72,9 +71,8 @@ install -d -m 755 %{buildroot}%{_bindir}
 install -m 755 %{name} %{buildroot}%{_bindir}/
 
 # Icon
-#convert build/microscope.gif build/%{name}.png
-#install -D -p -m 644 build/%{name}.png %{buildroot}%{_datadir}/pixmaps/
-install -D -p -m 644  %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+convert build/microscope.gif build/%{name}.png
+install -Dm 644 build/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Desktop menu entry
 install -d -m 755 %{buildroot}%{_datadir}/applications
@@ -83,6 +81,7 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %files
 %defattr(-,root,root)
+%doc release-notes.html
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/%{name}/*.jar