From da56297c5ac0a425cd2eaaa8091dc83621ce3c38 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Sat, 17 Mar 2018 01:37:46 -0400 Subject: [PATCH] build: Correctly set plugin licenses --- .../io.github.Hexchat.Plugin.metainfo.xml.in | 2 +- data/misc/meson.build | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/misc/io.github.Hexchat.Plugin.metainfo.xml.in b/data/misc/io.github.Hexchat.Plugin.metainfo.xml.in index 552570b8..b4412ce2 100644 --- a/data/misc/io.github.Hexchat.Plugin.metainfo.xml.in +++ b/data/misc/io.github.Hexchat.Plugin.metainfo.xml.in @@ -5,7 +5,7 @@ @NAME@ Plugin @SUMMARY@ https://hexchat.github.io/ - GPL-2.0+ + @LICENSE@ CC0-1.0 tingping_AT_fedoraproject.org \ No newline at end of file diff --git a/data/misc/meson.build b/data/misc/meson.build index 26b037ce..6cbd9f91 100644 --- a/data/misc/meson.build +++ b/data/misc/meson.build @@ -74,46 +74,46 @@ if get_option('with-plugin') # FIXME: These should all get translated somewhere if get_option('with-checksum') plugin_metainfo += [ - ['Checksum', 'Calculates a checksum for all sent and recieved DCC files'] + ['Checksum', 'Calculates a checksum for all sent and recieved DCC files', 'MIT'] ] endif if get_option('with-fishlim') plugin_metainfo += [ - ['Fishlim', 'Allows setting a key for encrypted conversations'] + ['Fishlim', 'Allows setting a key for encrypted conversations', 'MIT AND GPL-2.0+'] ] endif if get_option('with-lua') != 'false' plugin_metainfo += [ - ['Lua', 'Provides a scripting interface in Lua'] + ['Lua', 'Provides a scripting interface in Lua', 'MIT'] ] endif if get_option('with-perl') plugin_metainfo += [ - ['Perl', 'Provides a scripting interface in Perl'] + ['Perl', 'Provides a scripting interface in Perl', 'GPL-2.0+'] ] endif if get_option('with-python') != 'false' plugin_metainfo += [ - ['Python', 'Provides a scripting interface in Python'] + ['Python', 'Provides a scripting interface in Python', 'GPL-2.0+'] ] endif if get_option('with-sysinfo') plugin_metainfo += [ - ['Sysinfo', 'Adds command to display system information'] + ['Sysinfo', 'Adds command to display system information', 'GPL-2.0+'] ] endif foreach metainfo : plugin_metainfo name = metainfo[0] - desc = metainfo[1] conf = configuration_data() conf.set('NAME', name) - conf.set('SUMMARY', desc) + conf.set('SUMMARY', metainfo[1]) + conf.set('LICENSE', metainfo[2]) configure_file( input: 'io.github.Hexchat.Plugin.metainfo.xml.in',