rpm-software-management · dcantrell · Nov 8, 2023
diff --git a/dnf/dnf-command.c b/dnf/dnf-command.c
@@ -2,18 +2,7 @@
  *
  * Copyright © 2016 Igor Gnatenko <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command.h"

diff --git a/dnf/dnf-command.h b/dnf/dnf-command.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2016 Igor Gnatenko <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/dnf-main.c b/dnf/dnf-main.c
@@ -5,18 +5,7 @@
  * Copyright © 2016-2017 Igor Gnatenko <[email protected]>
  * Copyright © 2017-2021 Jaroslav Rohel <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <locale.h>

diff --git a/dnf/dnf-utils.c b/dnf/dnf-utils.c
@@ -5,18 +5,7 @@
  * Copyright © 2016-2017 Igor Gnatenko <[email protected]>
  * Copyright © 2017-2020 Jaroslav Rohel <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-utils.h"

diff --git a/dnf/dnf-utils.h b/dnf/dnf-utils.h
@@ -3,18 +3,7 @@
  * Copyright © 2016 Colin Walters <[email protected]>
  * Copyright © 2016-2017 Igor Gnatenko <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/clean/clean.plugin b/dnf/plugins/clean/clean.plugin
@@ -4,6 +4,6 @@ Embedded = dnf_command_clean_register_types
 Name = clean
 Description = Remove cached data
 Authors = Jaroslav Rohel <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright © 2017 Jaroslav Rohel
 X-Command-Syntax = clean all
diff --git a/dnf/plugins/clean/dnf-command-clean.c b/dnf/plugins/clean/dnf-command-clean.c
@@ -2,18 +2,7 @@
  *
  * Copyright © 2017 Jaroslav Rohel <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-clean.h"

diff --git a/dnf/plugins/clean/dnf-command-clean.h b/dnf/plugins/clean/dnf-command-clean.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2017 Jaroslav Rohel <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/distrosync/distrosync.plugin b/dnf/plugins/distrosync/distrosync.plugin
@@ -4,7 +4,7 @@ Embedded = dnf_command_distrosync_register_types
 Name = distro-sync
 Description = Upgrade/downgrade packages to match versions in repositories
 Authors = Neal Gompa <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright © 2021 Neal Gompa
 X-Command-Syntax = distro-sync [PACKAGE…]
 X-Alias-Name = dsync

diff --git a/dnf/plugins/distrosync/dnf-command-distrosync.c b/dnf/plugins/distrosync/dnf-command-distrosync.c
@@ -2,18 +2,7 @@
  *
  * Copyright © 2021 Neal Gompa <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-distrosync.h"

diff --git a/dnf/plugins/distrosync/dnf-command-distrosync.h b/dnf/plugins/distrosync/dnf-command-distrosync.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2021 Neal Gompa <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/download/dnf-command-download.c b/dnf/plugins/download/dnf-command-download.c
@@ -3,18 +3,7 @@
  * Copyright © 2020-2021 Daniel Hams <[email protected]>
  * Copyright © 2021 Jaroslav Rohel <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-download.h"

diff --git a/dnf/plugins/download/dnf-command-download.h b/dnf/plugins/download/dnf-command-download.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2020-2021 Daniel Hams <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/download/download.plugin b/dnf/plugins/download/download.plugin
@@ -4,6 +4,6 @@ Embedded = dnf_command_download_register_types
 Name = download
 Description = Download packages
 Authors = Daniel Hams <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright © 2020-2021 Daniel Hams
 X-Command-Syntax = download [OPTION…] PACKAGE [PACKAGE…]
diff --git a/dnf/plugins/install/dnf-command-install.c b/dnf/plugins/install/dnf-command-install.c
@@ -4,18 +4,7 @@
  * Copyright © 2016 Colin Walters <[email protected]>
  * Copyright © 2016-2017 Igor Gnatenko <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-install.h"

diff --git a/dnf/plugins/install/dnf-command-install.h b/dnf/plugins/install/dnf-command-install.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2016 Igor Gnatenko <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/install/install.plugin b/dnf/plugins/install/install.plugin
@@ -4,6 +4,6 @@ Embedded = dnf_command_install_register_types
 Name = install
 Description = Install packages
 Authors = Richard Hughes <[email protected]>, Colin Walters <[email protected]>, Igor Gnatenko <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright © 2010-2016 Richard Hughes, Colin Walters, Igor Gnatenko
 X-Command-Syntax = install PACKAGE [PACKAGE…]
diff --git a/dnf/plugins/leaves/dnf-command-leaves.c b/dnf/plugins/leaves/dnf-command-leaves.c
@@ -2,18 +2,7 @@
  *
  * Copyright © 2022 Emil Renner Berthing <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-leaves.h"

diff --git a/dnf/plugins/leaves/dnf-command-leaves.h b/dnf/plugins/leaves/dnf-command-leaves.h
@@ -2,18 +2,7 @@
  *
  * Copyright © 2022 Emil Renner Berthing <[email protected]>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/leaves/leaves.plugin b/dnf/plugins/leaves/leaves.plugin
@@ -4,6 +4,6 @@ Embedded = dnf_command_leaves_register_types
 Name = leaves
 Description = List installed packages not required by other installed packages
 Authors = Emil Renner Berthing <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright (C) 2022 Emil Renner Berthing
 X-Command-Syntax = leaves
diff --git a/dnf/plugins/makecache/dnf-command-makecache.c b/dnf/plugins/makecache/dnf-command-makecache.c
@@ -2,18 +2,7 @@
  *
  * Copyright (C) 2021 Red Hat, Inc.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "dnf-command-makecache.h"

diff --git a/dnf/plugins/makecache/dnf-command-makecache.h b/dnf/plugins/makecache/dnf-command-makecache.h
@@ -2,18 +2,7 @@
  *
  * Copyright (C) 2021 Red Hat, Inc.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once

diff --git a/dnf/plugins/makecache/makecache.plugin b/dnf/plugins/makecache/makecache.plugin
@@ -4,6 +4,6 @@ Embedded = dnf_command_makecache_register_types
 Name = makecache
 Description = Generate the metadata cache
 Authors = Jaroslav Rohel <[email protected]>
-License = GPL-2.0+
+License = GPL-2.0-or-later
 Copyright = Copyright (C) 2021 Red Hat, Inc.
 X-Command-Syntax = makecache