[mpich2] fix license tag, remove non-free images

Tom Callaway spot at fedoraproject.org
Tue Aug 27 16:51:40 UTC 2013 

commit 0da6a35a21dae7cc876622dfe85a4f275272f406
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Aug 27 12:51:57 2013 -0400

    fix license tag, remove non-free images

 HandClose16.gif       |  Bin 0 -> 438 bytes
 HandClose25.gif       |  Bin 0 -> 750 bytes
 HandCloseUpLeft25.gif |  Bin 0 -> 776 bytes
 HandOpen16.gif        |  Bin 0 -> 683 bytes
 HandOpenUpLeft16.gif  |  Bin 0 -> 698 bytes
 HandOpenUpLeft25.gif  |  Bin 0 -> 1282 bytes
 ZoomBW16.gif          |  Bin 0 -> 1015 bytes
 ZoomIn24.gif          |  Bin 0 -> 1118 bytes
 ZoomLeft.gif          |  Bin 0 -> 1086 bytes
 ZoomLowRight.gif      |  Bin 0 -> 1114 bytes
 ZoomMinusUpLeft25.gif |  Bin 0 -> 1151 bytes
 ZoomOut24.gif         |  Bin 0 -> 1117 bytes
 ZoomPlus.gif          |  Bin 0 -> 1130 bytes
 ZoomPlusUpLeft25.gif  |  Bin 0 -> 1152 bytes
 ZoomRight.gif         |  Bin 0 -> 1085 bytes
 ZoomSet24.gif         |  Bin 0 -> 1149 bytes
 mpich2.spec           |   89 +++++++++++++++++++++++++++++++++++++++++++++++-
 17 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/HandClose16.gif b/HandClose16.gif
new file mode 100644
index 0000000..b0b6551
Binary files /dev/null and b/HandClose16.gif differ
diff --git a/HandClose25.gif b/HandClose25.gif
new file mode 100644
index 0000000..d7f0c94
Binary files /dev/null and b/HandClose25.gif differ
diff --git a/HandCloseUpLeft25.gif b/HandCloseUpLeft25.gif
new file mode 100644
index 0000000..5909f62
Binary files /dev/null and b/HandCloseUpLeft25.gif differ
diff --git a/HandOpen16.gif b/HandOpen16.gif
new file mode 100644
index 0000000..d8d327a
Binary files /dev/null and b/HandOpen16.gif differ
diff --git a/HandOpenUpLeft16.gif b/HandOpenUpLeft16.gif
new file mode 100644
index 0000000..44bd856
Binary files /dev/null and b/HandOpenUpLeft16.gif differ
diff --git a/HandOpenUpLeft25.gif b/HandOpenUpLeft25.gif
new file mode 100644
index 0000000..c3d33a0
Binary files /dev/null and b/HandOpenUpLeft25.gif differ
diff --git a/ZoomBW16.gif b/ZoomBW16.gif
new file mode 100644
index 0000000..71b0a76
Binary files /dev/null and b/ZoomBW16.gif differ
diff --git a/ZoomIn24.gif b/ZoomIn24.gif
new file mode 100644
index 0000000..f8c2328
Binary files /dev/null and b/ZoomIn24.gif differ
diff --git a/ZoomLeft.gif b/ZoomLeft.gif
new file mode 100644
index 0000000..092a462
Binary files /dev/null and b/ZoomLeft.gif differ
diff --git a/ZoomLowRight.gif b/ZoomLowRight.gif
new file mode 100644
index 0000000..2322d85
Binary files /dev/null and b/ZoomLowRight.gif differ
diff --git a/ZoomMinusUpLeft25.gif b/ZoomMinusUpLeft25.gif
new file mode 100644
index 0000000..3779353
Binary files /dev/null and b/ZoomMinusUpLeft25.gif differ
diff --git a/ZoomOut24.gif b/ZoomOut24.gif
new file mode 100644
index 0000000..98b3abb
Binary files /dev/null and b/ZoomOut24.gif differ
diff --git a/ZoomPlus.gif b/ZoomPlus.gif
new file mode 100644
index 0000000..b640199
Binary files /dev/null and b/ZoomPlus.gif differ
diff --git a/ZoomPlusUpLeft25.gif b/ZoomPlusUpLeft25.gif
new file mode 100644
index 0000000..a2801df
Binary files /dev/null and b/ZoomPlusUpLeft25.gif differ
diff --git a/ZoomRight.gif b/ZoomRight.gif
new file mode 100644
index 0000000..9f4d42c
Binary files /dev/null and b/ZoomRight.gif differ
diff --git a/ZoomSet24.gif b/ZoomSet24.gif
new file mode 100644
index 0000000..aba15a6
Binary files /dev/null and b/ZoomSet24.gif differ
diff --git a/mpich2.spec b/mpich2.spec
index 138b12f..2ecdf4e 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -4,12 +4,32 @@ Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.5
 Release:	3%{?dist}
-License:	MIT
+License:	MIT and BSD and CC-BY-SA and Public Domain
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
 
 Source0:	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
-Source1:	mpich2.macros	
+Source1:	mpich2.macros
+# Derived from http://androidgogy.com/2012/04/02/free-hand-icon-cursors/
+# CC-BY-SA	
+Source2:	HandClose16.gif
+Source3:	HandClose25.gif
+Source4:	HandCloseUpLeft25.gif
+Source5:	HandOpen16.gif
+Source6:	HandOpenUpLeft16.gif
+Source7:	HandOpenUpLeft25.gif
+# Derived from Tango icon set
+# Public Domain
+Source8:	ZoomBW16.gif
+Source9:	ZoomIn24.gif
+Source10:	ZoomLeft.gif
+Source11:	ZoomLowRight.gif
+Source12:	ZoomMinusUpLeft25.gif
+Source13:	ZoomOut24.gif
+Source14:	ZoomPlus.gif
+Source15:	ZoomPlusUpLeft25.gif
+Source16:	ZoomRight.gif
+Source17:	ZoomSet24.gif
 Patch0:		mpich2-modules.patch
 
 BuildRequires:	libXt-devel, bison, flex, libuuid-devel
@@ -20,6 +40,8 @@ BuildRequires:	automake autoconf libtool gettext
 %ifnarch s390 s390x %{arm}
 BuildRequires:	valgrind-devel
 %endif
+# Need to replace the non-free Sun images
+BuildRequires:	tango-icon-theme
 Provides:	mpi
 Obsoletes:	%{name}-libs < 1.1.1
 Obsoletes:	%{name}-mpd < 1.4.1
@@ -118,6 +140,65 @@ Contains documentations, examples and manpages for mpich2
 %setup -q
 %patch0 -p0 -b .modu
 
+# Replacing the non-free Sun artwork with roughly equivalent tango icons.
+# Thanks, Tango!
+# These end up inside .jar files, so we need to cp them.
+# Just the Sun images though, not the custom mpich2 art.
+pushd src/mpe2/src/slog2sdk/src/images/
+rm -rf About24.gif Backward24.gif Convert24.gif ConvertCancel24.gif ConvertOk24.gif Copy24.gif \
+       Delete24.gif Down24.gif Edit24.gif Find24.gif FindBack24.gif FindFore24.gif Forward24.gif \
+       Help24.gif Home24.gif Information24.gif Movie24.gif New24.gif Open24.gif Paste24.gif \
+       Preferences24.gif Print24.gif Properties24.gif Redo24.gif Refresh24.gif Remove24.gif \
+       Save24.gif SaveAll24.gif SaveAs24.gif Stop24.gif TreeCollapse24.gif TreeCommit24.gif \
+       TreeExpand24.gif Undo24.gif Up24.gif WinRedo.gif WinUndo.gif ZoomCross.gif LICENSE
+convert /usr/share/icons/Tango/24x24/status/info.png ./About24.gif
+convert /usr/share/icons/Tango/24x24/actions/back.png ./Backward24.gif
+convert /usr/share/icons/Tango/24x24/actions/editcopy.png ./Convert24.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-cancel.png ./ConvertCancel24.gif
+convert /usr/share/icons/Tango/24x24/emotes/face-smile.png ./ConvertOk24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_copy.png ./Copy24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_delete.png ./Delete24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_down.png ./Down24.gif
+convert /usr/share/icons/Tango/24x24/apps/text-editor.png ./Edit24.gif
+convert /usr/share/icons/Tango/24x24/actions/find.png ./Find24.gif
+convert /usr/share/icons/Tango/24x24/actions/back.png ./FindBack24.gif
+convert /usr/share/icons/Tango/24x24/actions/forward.png ./FindFore24.gif
+convert	/usr/share/icons/Tango/24x24/actions/forward.png ./Forward24.gif
+convert /usr/share/icons/Tango/24x24/apps/gnome-help.png ./Help24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_home.png ./Home24.gif
+convert /usr/share/icons/Tango/24x24/status/info.png ./Information24.gif
+convert /usr/share/icons/Tango/24x24/mimetypes/video.png ./Movie24.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-new.png ./New24.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-open.png ./Open24.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-paste.png ./Paste24.gif
+convert /usr/share/icons/Tango/24x24/categories/gtk-preferences.png ./Preferences24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_print.png ./Print24.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-properties.png ./Properties24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_redo.png ./Redo24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_refresh.png ./Refresh24.gif
+convert /usr/share/icons/Tango/24x24/actions/remove.png ./Remove24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_save.png ./Save24.gif
+convert /usr/share/icons/Tango/24x24/actions/geany-save-all.png ./SaveAll24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_save-as.png ./SaveAs24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_stop.png ./Stop24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_left.png ./TreeCollapse24.gif
+convert /usr/share/icons/Tango/24x24/mimetypes/x-office-spreadsheet.png ./TreeCommit24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_right.png ./TreeExpand24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_undo.png ./Undo24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_up.png ./Up24.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_redo.png ./WinRedo.gif
+convert /usr/share/icons/Tango/24x24/actions/stock_undo.png ./WinUndo.gif
+convert /usr/share/icons/Tango/24x24/actions/gtk-add.png ./ZoomCross.gif
+# These images were taken from http://androidgogy.com/2012/04/02/free-hand-icon-cursors/ and resized.
+# Hand Cursors by Steve Flowers is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+rm -rf Hand*
+cp -a %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+# These images were converted from the "search.png" icon in the Tango set.
+# Public Domain
+rm -rf Zoom*.gif
+cp -a %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} .
+popd
+
 %build
 %configure	\
 	--enable-sharedlibs=gcc					\
@@ -276,6 +357,10 @@ fi
 %exclude %{_datadir}/%{name}/examples/*/Makefile-%{_arch}
 
 %changelog
+* Tue Aug 27 2013 Tom Callaway <spot at fedoraproject.org> - 1.5-4
+- remove non-free Sun images, replace them with PD and CC-BY-SA 3.0 images
+- correct license tag
+
 * Wed Mar 20 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.5-3
 - Remove %%config from %%{_sysconfdir}/rpm/macros.*
   (https://fedorahosted.org/fpc/ticket/259).

More information about the scm-commits mailing list