use license file from source tar

3 files changed, 1 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb0f1d3dc96d..8e7e1d77ef43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,10 +14,8 @@ pkgbase = trac
 	optdepends = python2-pygments: Syntax highlighting
 	optdepends = python2-docutils: reStructuredText support
 	source = https://download.edgewall.org/trac/Trac-1.4.2.tar.gz
-	source = license.txt
 	source = tracd.service
 	sha256sums = 42372fcd9f2ac46264656287fe6edb8230f59b44e991ee098b399f1bb475ae8f
-	sha256sums = a0936aa2fab3714eb6a3e8ff64b730576d8a5f81340a0601f006c847761607c4
 	sha256sums = 3f050f1c9367b1b28e18a6ff0088f991676a9fbba3f5177859ce4db64f95ca42
 
 pkgname = trac
diff --git a/PKGBUILD b/PKGBUILD
index b488771527ec..6b869ef15631 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,10 +15,8 @@ optdepends=('python2-psycopg2: PostgreSQL database support'
             'python2-docutils: reStructuredText support')
 install=trac.install
 source=(https://download.edgewall.org/trac/Trac-$pkgver.tar.gz
-        license.txt
         tracd.service)
 sha256sums=('42372fcd9f2ac46264656287fe6edb8230f59b44e991ee098b399f1bb475ae8f'
-            'a0936aa2fab3714eb6a3e8ff64b730576d8a5f81340a0601f006c847761607c4'
             '3f050f1c9367b1b28e18a6ff0088f991676a9fbba3f5177859ce4db64f95ca42')
 
 prepare() {
@@ -34,6 +32,6 @@ prepare() {
 package() {
   cd "$srcdir"/Trac-$pkgver
   python2 setup.py install --prefix=/usr --root="$pkgdir"
-  install -D -m644 "$srcdir"/license.txt "$pkgdir"/usr/share/licenses/trac/license.txt
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/trac/COPYING
   install -Dm0644 "$srcdir"/tracd.service "$pkgdir"/usr/lib/systemd/system/tracd.service
 }
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 22b213f2f9f4..000000000000
--- a/license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (C) 2003-2005 Edgewall Software
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-