rpms/stardict-dic-zh_CN/F-9 sources, 1.2, 1.3 stardict-dic-zh_CN.spec, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599/F-9

Modified Files:
	sources stardict-dic-zh_CN.spec 
Log Message:
fix licensing issues on all branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jul 2007 08:49:49 -0000	1.2
+++ sources	6 Sep 2008 18:14:23 -0000	1.3
@@ -1,8 +1,3 @@
-68e539f362de416490b78fed97aba780  stardict-cdict-gb-2.4.2.tar.bz2
-d8db9bdbf0dd4856d03e04d3f73d9c5a  stardict-cedict-gb-2.4.2.tar.bz2
-8e9700798a0ffeed23207b7cf2592246  stardict-langdao-ce-gb-2.4.2.tar.bz2
-41a71f5b3952709746dd7e52cf155b8b  stardict-langdao-ec-gb-2.4.2.tar.bz2
-c175f9bcb88e7513380ad05b291a8a03  stardict-oxford-gb-2.4.2.tar.bz2
 4467d7941f9388f0e01ee3025c400b5c  stardict-stardict1.3-2.4.2.tar.bz2
 745727367e22ab9740256ceaf16cb83d  stardict-xdict-ce-gb-2.4.2.tar.bz2
 364bcecc126d6d8560728dc487ea9eaf  stardict-xdict-ec-gb-2.4.2.tar.bz2


Index: stardict-dic-zh_CN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict-dic-zh_CN/F-9/stardict-dic-zh_CN.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-dic-zh_CN.spec	4 Jul 2007 08:49:49 -0000	1.1
+++ stardict-dic-zh_CN.spec	6 Sep 2008 18:14:23 -0000	1.2
@@ -1,17 +1,28 @@
 Name: stardict-dic-zh_CN
 Summary: Simplified Chinese(zh_CN) dictionaries for StarDict
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
-License: GPL
+License: GPL+
 URL: http://stardict.sourceforge.net
 
-Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
-Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
-Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
-Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
-Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# Hi. Are you adding a dictionary here? Please be sure we have a clear license for it.
+# The stardict page is _NOT_ a trusted source for licensing.
+# Not sure? Don't include it, or email fedora-legal at redhat.com first.
+
+# Cannot find licensing.
+# Source0: http://downloads.sourceforge.net/stardict/stardict-cdict-gb-2.4.2.tar.bz2
+# CEDICT license is non-free
+# Source1: http://downloads.sourceforge.net/stardict/stardict-cedict-gb-2.4.2.tar.bz2
+# Cannot find licensing
+# Source2: http://downloads.sourceforge.net/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
+# Source3: http://downloads.sourceforge.net/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
+# Almost certainly not used with permission.
+# Source4: http://downloads.sourceforge.net/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+# From upstream stardict, okay.
 Source5: http://downloads.sourceforge.net/stardict/stardict-stardict1.3-2.4.2.tar.bz2
+# From http://ftp.cdut.edu.cn/pub/linux/system/chinese/xdict/xdict.README
+# GPL+
 Source6: http://downloads.sourceforge.net/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
 Source7: http://downloads.sourceforge.net/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
 
@@ -23,17 +34,16 @@
 %description
 Simplified Chinese(zh_CN) dictionaries for StarDict.
 These dictionaries are included currently:
-cdict-gb, cedict-gb, langdao-ce-gb, langdao-ec-gb,
-oxford-gb, stardict1.3, xdict-ce-gb, xdict-ec-gb.
+stardict1.3, xdict-ce-gb, xdict-ec-gb.
 You can download more at: http://stardict.sourceforge.net
 
 %prep
 %setup -c -T -n %{name}-%{version}
-%setup -q -n %{name}-%{version} -D -T -a 0
-%setup -q -n %{name}-%{version} -D -T -a 1
-%setup -q -n %{name}-%{version} -D -T -a 2
-%setup -q -n %{name}-%{version} -D -T -a 3
-%setup -q -n %{name}-%{version} -D -T -a 4
+# %%setup -q -n %{name}-%{version} -D -T -a 0
+# %%setup -q -n %{name}-%{version} -D -T -a 1
+# %%setup -q -n %{name}-%{version} -D -T -a 2
+# %%setup -q -n %{name}-%{version} -D -T -a 3
+# %%setup -q -n %{name}-%{version} -D -T -a 4
 %setup -q -n %{name}-%{version} -D -T -a 5
 %setup -q -n %{name}-%{version} -D -T -a 6
 %setup -q -n %{name}-%{version} -D -T -a 7
@@ -53,6 +63,10 @@
 %{_datadir}/stardict/dic/*
 
 %changelog
+* Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-4
+- fix license tag
+- remove dictionaries for which the licensing is unclear (or outright forbidden)
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 2.4.2-3
 - Separate spec files for each language's dictionaries.