Merge pull request #333 from dirkmueller/copyright_fixup

Update copyright header

Author: danigm

spec_cleaner/rpmcleaner.py

@@ -421,7 +421,7 @@ def run(self) -> None:
 
     def __del__(self) -> None:
         """Close the input and output files."""
-        if self.fin:
+        if hasattr(self, 'fin'):
             self.fin.close()
-        if self.fout:
+        if hasattr(self, 'fout'):
             self.fout.close()

spec_cleaner/rpmcopyright.py

@@ -22,7 +22,7 @@ def __init__(self, options):
         self.year = options['copyright_year']
         self.copyrights = []
         self.buildrules = []
-        self.distro_copyright = '# Copyright (c) {0} SUSE LLC'.format(self.year)
+        self.distro_copyright = '# Copyright (c) {0} SUSE LLC and contributors'.format(self.year)
         self.vimmodeline = ''
 
     def _add_pkg_header(self):

tests/header/header.spec

@@ -2,7 +2,7 @@
 #
 # spec file for package header
 #
-# Copyright (c) 2013 SUSE LLC
+# Copyright (c) 2013 SUSE LLC and contributors
 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
 #
 # All modifications and additions to the file contributed by third parties

tests/in/rpmpreamble.spec

@@ -25,8 +25,8 @@ Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1+
 Group:          Productivity/Networking/Web/Servers
 Url:            https://www.gnu.org/software/libmicrohttpd/
-Source0:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
+Source0:        http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz
+Source1:        http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig
 Source2:        libmicrohttpd.keyring
 # PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS)
 Patch1:         disable-stalling-test.patch

tests/out-minimal/rpmpreamble.spec

@@ -25,8 +25,8 @@ Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1-or-later
 Group:          Productivity/Networking/Web/Servers
 URL:            https://www.gnu.org/software/libmicrohttpd/
-Source0:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
+Source0:        http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz
+Source1:        http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig
 Source2:        libmicrohttpd.keyring
 # PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS)
 Patch1:         disable-stalling-test.patch

tests/out/rpmpreamble.spec

@@ -25,8 +25,8 @@ Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1-or-later
 Group:          Productivity/Networking/Web/Servers
 URL:            https://www.gnu.org/software/libmicrohttpd/
-Source0:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
+Source0:        https://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz
+Source1:        https://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig
 Source2:        libmicrohttpd.keyring
 # PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS)
 Patch1:         disable-stalling-test.patch