Download as
Browse Code »

Commit f262c1e28df91b6c053aba435e6c8017d2e62853

Authored by Davide Cavalca
1 parent 8ab1afaf
Exists in master and in 2 other branches develop, script-support

Convert from appdata to metainfo

Showing 8 changed files with 79 additions and 75 deletions   Show diff stats
@@ -57,7 +57,7 @@ src/include/lib3270 @@ -57,7 +57,7 @@ src/include/lib3270
57 vgcore.* 57 vgcore.*
58 gschemas.compiled 58 gschemas.compiled
59 *.gschema.xml 59 *.gschema.xml
60 -appdata.xml 60 +metainfo.xml
61 *.metainfo.xml 61 *.metainfo.xml
62 62
63 *.[0-9] 63 *.[0-9]
branding/Makefile.in
  Diff comments   View file @f262c1e
@@ -101,7 +101,7 @@ endif @@ -101,7 +101,7 @@ endif
101 validate: 101 validate:
102 102
103 ifneq ($(SCOUR),no) 103 ifneq ($(SCOUR),no)
104 - @$(APPSTREAMCLI) validate appdata.xml 104 + @$(APPSTREAMCLI) validate metainfo.xml
105 endif 105 endif
106 106
107 107
@@ -128,10 +128,10 @@ install-linux: \ @@ -128,10 +128,10 @@ install-linux: \
128 mime.xml \ 128 mime.xml \
129 $(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml 129 $(DESTDIR)$(datarootdir)/mime/packages/$(PRODUCT_NAME).xml
130 130
131 - @$(MKDIR) $(DESTDIR)$(datarootdir)/appdata 131 + @$(MKDIR) $(DESTDIR)$(datarootdir)/metainfo
132 @$(INSTALL_DATA) \ 132 @$(INSTALL_DATA) \
133 - appdata.xml \  
134 - $(DESTDIR)$(datarootdir)/appdata/$(APPLICATION_ID).appdata.xml 133 + metainfo.xml \
  134 + $(DESTDIR)$(datarootdir)/metainfo/$(APPLICATION_ID).metainfo.xml
135 135
136 @$(MKDIR) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps 136 @$(MKDIR) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
137 @$(INSTALL_DATA) \ 137 @$(INSTALL_DATA) \
branding/appdata.xml.in
View file @8ab1afa
@@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -  
3 -<!--  
4 -  
5 - References:  
6 -  
7 - https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps  
8 - https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf  
9 - https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/  
10 -  
11 --->  
12 -  
13 -<component type="desktop">  
14 -  
15 - <id>@APPLICATION_ID@.desktop</id>  
16 -  
17 - <metadata_license>CC0-1.0</metadata_license>  
18 - <project_license>LGPL-3.0</project_license>  
19 -  
20 - <name>@PRODUCT_NAME@</name>  
21 - <name xml:lang="pt_BR">@PRODUCT_NAME@</name>  
22 -  
23 - <summary>IBM 3270 Terminal emulator</summary>  
24 - <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>  
25 -  
26 - <developer_name>Perry Werneck</developer_name>  
27 -  
28 - <description>  
29 - <p>GTK Based 3270 terminal emulator</p>  
30 - <p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>  
31 - <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>  
32 - </description>  
33 -  
34 - <description xml:lang="pt_BR">  
35 - <p>Emulador de terminal 3270 baseado em GTK-3</p>  
36 - <p>@PRODUCT_NAME@ é um emulador tn3270 moderno, baseado em GTK e completamente livre.</p>  
37 - <p>Criado originalmente para o Banco do Brasil, agora é um projeto de software público do governo brasileiro usado em todo o mundo.</p>  
38 - </description>  
39 -  
40 - <url type="homepage">https://github.com/PerryWerneck/pw3270</url>  
41 - <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>  
42 -  
43 - <screenshots>  
44 - <screenshot type="default">  
45 - <caption>Acessing MVS with @PRODUCT_NAME@</caption>  
46 - <caption xml:lang="pt_BR">@PRODUCT_NAME@ acessando MVS</caption>  
47 - <image>https://raw.githubusercontent.com/PerryWerneck/PerryWerneck/master/screenshots/mvs-tk4.png</image>  
48 - </screenshot>  
49 - </screenshots>  
50 -  
51 - <update_contact>perry.werneck@gmail.com</update_contact>  
52 -  
53 - <project_group>GNOME</project_group>  
54 -  
55 - <provides>  
56 - <binary>@PRODUCT_NAME@</binary>  
57 - </provides>  
58 -  
59 - <translation type="gettext">@PRODUCT_NAME@</translation>  
60 -  
61 -</component>  
branding/metainfo.xml.in 0 → 100644
  Diff comments   View file @f262c1e
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +
  3 +<!--
  4 +
  5 + References:
  6 +
  7 + https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
  8 + https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf
  9 + https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/
  10 +
  11 +-->
  12 +
  13 +<component type="desktop-application">
  14 +
  15 + <id>@APPLICATION_ID@</id>
  16 +
  17 + <metadata_license>CC0-1.0</metadata_license>
  18 + <project_license>LGPL-3.0</project_license>
  19 + <content_rating type="oars-1.1" />
  20 +
  21 + <name>@PRODUCT_NAME@</name>
  22 + <name xml:lang="pt_BR">@PRODUCT_NAME@</name>
  23 +
  24 + <summary>IBM 3270 Terminal emulator</summary>
  25 + <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
  26 +
  27 + <developer_name>Perry Werneck</developer_name>
  28 +
  29 + <description>
  30 + <p>GTK Based 3270 terminal emulator</p>
  31 + <p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>
  32 + <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
  33 + </description>
  34 +
  35 + <description xml:lang="pt_BR">
  36 + <p>Emulador de terminal 3270 baseado em GTK-3</p>
  37 + <p>@PRODUCT_NAME@ é um emulador tn3270 moderno, baseado em GTK e completamente livre.</p>
  38 + <p>Criado originalmente para o Banco do Brasil, agora é um projeto de software público do governo brasileiro usado em todo o mundo.</p>
  39 + </description>
  40 +
  41 + <url type="homepage">https://github.com/PerryWerneck/pw3270</url>
  42 + <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
  43 +
  44 + <launchable type="desktop-id">@APPLICATION_ID@.desktop</launchable>
  45 +
  46 + <screenshots>
  47 + <screenshot type="default">
  48 + <caption>Acessing MVS with @PRODUCT_NAME@</caption>
  49 + <caption xml:lang="pt_BR">@PRODUCT_NAME@ acessando MVS</caption>
  50 + <image>https://raw.githubusercontent.com/PerryWerneck/PerryWerneck/master/screenshots/mvs-tk4.png</image>
  51 + </screenshot>
  52 + </screenshots>
  53 +
  54 + <update_contact>perry.werneck@gmail.com</update_contact>
  55 +
  56 + <provides>
  57 + <binary>@PRODUCT_NAME@</binary>
  58 + </provides>
  59 +
  60 + <translation type="gettext">@PRODUCT_NAME@</translation>
  61 +
  62 + <releases>
  63 + <release version="@VERSION@"/>
  64 + </releases>
  65 +</component>
@@ -279,7 +279,7 @@ AC_CONFIG_FILES(locale/Makefile) @@ -279,7 +279,7 @@ AC_CONFIG_FILES(locale/Makefile)
279 AC_CONFIG_FILES(branding/Makefile) 279 AC_CONFIG_FILES(branding/Makefile)
280 AC_CONFIG_FILES(branding/launcher.desktop) 280 AC_CONFIG_FILES(branding/launcher.desktop)
281 AC_CONFIG_FILES(branding/mime.xml) 281 AC_CONFIG_FILES(branding/mime.xml)
282 -AC_CONFIG_FILES(branding/appdata.xml) 282 +AC_CONFIG_FILES(branding/metainfo.xml)
283 dnl AC_CONFIG_FILES(branding/keypad.metainfo.xml) 283 dnl AC_CONFIG_FILES(branding/keypad.metainfo.xml)
284 284
285 dnl --------------------------------------------------------------------------- 285 dnl ---------------------------------------------------------------------------
rpm/pw3270.spec
  Diff comments   View file @f262c1e
@@ -142,7 +142,7 @@ make all -j1 @@ -142,7 +142,7 @@ make all -j1
142 142
143 %find_lang pw3270 langfiles 143 %find_lang pw3270 langfiles
144 144
145 -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml 145 +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
146 146
147 %fdupes %{buildroot}/%{_prefix} 147 %fdupes %{buildroot}/%{_prefix}
148 148
@@ -162,7 +162,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. @@ -162,7 +162,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
162 162
163 # Desktop files 163 # Desktop files
164 %{_datadir}/applications/*.desktop 164 %{_datadir}/applications/*.desktop
165 -%{_datadir}/appdata/*.appdata.xml 165 +%{_datadir}/metainfo/*.metainfo.xml
166 166
167 # Icons 167 # Icons
168 %{_datadir}/%{_product}/icons/*.svg 168 %{_datadir}/%{_product}/icons/*.svg
validate-appdata.sh
View file @8ab1afa
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
1 -#!/bin/bash  
2 -./configure  
3 -  
4 -cp branding/appdata.xml /tmp/pw3270.appdata.xml  
5 -appstream-util validate /tmp/pw3270.appdata.xml  
6 -  
validate-metainfo.sh 0 → 100755
  Diff comments   View file @f262c1e
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +#!/bin/bash
  2 +./configure
  3 +
  4 +cp branding/metainfo.xml /tmp/pw3270.metainfo.xml
  5 +appstream-util validate /tmp/pw3270.metainfo.xml
  6 +