Fixed licensing issue. Changed architecture to "any".

4 files changed, 29 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4008d3b029b..970a26ebd890 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = idos-timetable-lang-en
 	pkgdesc = English language ressource file for railway/ public transport timetable search engines by CHAPS.
 	pkgver = 20160520
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 0
-	arch = i686
-	arch = x86_64
+	arch = any
 	groups = idos-timetable
 	license = custom
 	makedepends = bdelta
@@ -13,11 +12,11 @@ pkgbase = idos-timetable-lang-en
 	source = ttakt.zip::http://ttakt.chaps.cz/TTAktual/Win/Zip/TTAKT.ZIP
 	source = TTC-TTe.bdelta.xz
 	source = copying.info.txt
-	source = licence_cc-nc-sa-1.0.html
+	source = license_cc-nc-1.0.html
 	sha256sums = SKIP
 	sha256sums = f1d90ca684e053db7d35b85207b202b2c4b73315a7b864d849f599eb7b8fd1ee
-	sha256sums = 0959ebb3373999b08742d91379a674264286ab9c538c4e3f7605e3ca012a258b
-	sha256sums = 66abb860546e55d992279b9a170713cea64c963a501ee5e947a2c675d6d1388b
+	sha256sums = 857ca643a994be4dc06ddf5423d66600a2d2ad26f0771d30819f27e2dfa5c002
+	sha256sums = 36c0b0466672bc90d9aa2219768f1ea1a72389cc63d89c4bb80bb4999628d8aa
 
 pkgname = idos-timetable-lang-en
 
diff --git a/PKGBUILD b/PKGBUILD
index b1359424b427..1f07dfb4a47f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ _pkgname=idos-timetable-lang-en
 pkgname="${_pkgname}"
 epoch=0
 pkgver=20160520
-pkgrel=1
+pkgrel=2
 pkgdesc="English language ressource file for railway/ public transport timetable search engines by CHAPS."
-arch=('i686' 'x86_64')
+arch=(any)
 license=('custom')
 
 groups=(
@@ -30,16 +30,20 @@ source=(
   "ttakt.zip::http://ttakt.chaps.cz/TTAktual/Win/Zip/TTAKT.ZIP"
   "TTC-TTe.bdelta.xz"
   "copying.info.txt"
-  "licence_cc-nc-sa-1.0.html"
+  "license_cc-nc-1.0.html"
 )
 
 sha256sums=(
   'SKIP'
   'f1d90ca684e053db7d35b85207b202b2c4b73315a7b864d849f599eb7b8fd1ee'
-  '0959ebb3373999b08742d91379a674264286ab9c538c4e3f7605e3ca012a258b'
-  '66abb860546e55d992279b9a170713cea64c963a501ee5e947a2c675d6d1388b'
+  '857ca643a994be4dc06ddf5423d66600a2d2ad26f0771d30819f27e2dfa5c002'
+  '36c0b0466672bc90d9aa2219768f1ea1a72389cc63d89c4bb80bb4999628d8aa'
 )
 
+pkgver() {
+  ls -L -l --time-style=+%Y%m%d "${srcdir}/TTC-TTe.bdelta.xz" | awk '{print $6}'
+}
+
 build() {
   cd "${srcdir}"
   
@@ -53,5 +57,5 @@ package() {
 
   install -D -m644 "${srcdir}/TTe.dll" "${_instdir}/TTe.dll"
   install -D -m644 "${srcdir}/copying.info.txt" "${pkgdir}/usr/share/licenses/${pkgname}/copying.info.txt"
-  install -D -m644 "${srcdir}/licence_cc-nc-sa-1.0.html" "${pkgdir}/usr/share/licenses/${pkgname}/licence_cc-nc-sa-1.0.html"
+  install -D -m644 "${srcdir}/license_cc-nc-1.0.html" "${pkgdir}/usr/share/licenses/${pkgname}/license_cc-nc-1.0.html"
 }
diff --git a/copying.info.txt b/copying.info.txt
index 326fdc56aa80..aebbfa515792 100644
--- a/copying.info.txt
+++ b/copying.info.txt
@@ -1,14 +1,19 @@
-This package, and the containing patch, which patches the ressource file "TTC.dll" of the IDOS-software of the czech company "CHAPS" to make it available in English language, is licenced under the following licence:
+Central content of this package is a patch, which patches the Czech ressource file "TTC.dll" of the IDOS timetable browser-software of the czech company "CHAPS spol. s r.o.", Bráfova 1617/21, CZ-616 00 Brno, http://chaps.cz/, to make the texts available in English language.
 
-  Creative Commons Non-Commercial Share-Alike 1.0 (cc-nc-sa-1.0)
+The "TTC.dll" is property of CHAPS and not distributed with this package; rather, when this package is build it is been downloaded from CHAPS directly.
 
-The text ot the licence is bundled with this package in a seperate file, but you can also read it online at
 
-  http://creativecommons.org/licenses/nc-sa/1.0/
+The above mentioned patch is licensed under the following license:
+
+  Creative Commons NonCommercial 1.0 (cc-nc-1.0)
+
+The text ot the license is bundled with this package in a seperate file, but you can also read it online at
+
+  http://creativecommons.org/licenses/nc/1.0/legalcode
 
 A summary is available at
 
-  http://creativecommons.org/licenses/nc-sa/1.0/
+  http://creativecommons.org/licenses/nc/1.0/
 
 and it boils down that you are free to
 
@@ -18,10 +23,11 @@ and it boils down that you are free to
 as long as you obey the following restrictions:
 
 * You may not use the material for commercial purposes,
-* If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+For details, read the legal license text.
 
 
-For details, read the legal licence text.
+The resulting English ressource file is not anymore covered under the cc-nc-1.0 license, since it contains property of CHAPS which may not be redistributed freely. Only the patch which is used to build the English ressource file from the Czech one is covered under the cc-nc-1.0 license.
 
 
 Enjoy this work!
diff --git a/licence_cc-nc-sa-1.0.html b/license_cc-nc-1.0.html
index 47fb75a78aa2..af0fa1a82b07 100644
--- a/licence_cc-nc-sa-1.0.html
+++ b/license_cc-nc-1.0.html
@@ -8,7 +8,7 @@
 <p align="center"><a href="/">Creative Commons</a></p>
 <div id="deed">
 <div align="center"><img src="/images/deed/logo_code.gif" alt="Creative Commons Legal Code" width="280" height="79" vspace="14" border="0"/></div>
-<p align="center"><b>NonCommercial-ShareAlike 1.0</b></p>
+<p align="center"><b>NonCommercial 1.0</b></p>
 <div class="text">
 <div class="fineprint" style="background-color:#ffc;">
 CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
@@ -64,9 +64,6 @@ to distribute copies or phonorecords of, display publicly, perform publicly, and
 You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested.
 </li>
 <li>
-You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License.
-</li>
-<li>
 You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works.
 </li>
 </ol>