Hello community, here is the log from the commit of package pw3270 for openSUSE:Factory checked in at 2020-12-08 13:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pw3270 (Old) and /work/SRC/openSUSE:Factory/.pw3270.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pw3270" Tue Dec 8 13:25:01 2020 rev:10 rq:853774 version:5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pw3270/pw3270.changes 2020-11-04 18:32:10.344176959 +0100 +++ /work/SRC/openSUSE:Factory/.pw3270.new.5913/pw3270.changes 2020-12-08 13:26:06.262777569 +0100 @@ -1,0 +2,5 @@ +Tue Nov 24 23:29:38 UTC 2020 - Perry Werneck <[email protected]> + +- Adding fix-appdata-xml.patch to fix problems with gnome-software. + +------------------------------------------------------------------- New: ---- fix-appdata-xml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pw3270.spec ++++++ --- /var/tmp/diff_new_pack.ROsEdy/_old 2020-12-08 13:26:06.822778401 +0100 +++ /var/tmp/diff_new_pack.ROsEdy/_new 2020-12-08 13:26:06.826778407 +0100 @@ -1,7 +1,7 @@ # # spec file for package pw3270 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) <2008> <Banco do Brasil S.A.> # # All modifications and additions to the file contributed by third parties @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + #---[ Versions ]------------------------------------------------------------------------------------------------------ %define _product %(pkg-config --variable=product_name lib3270) @@ -26,29 +27,29 @@ Version: 5.3 Release: 0 Summary: IBM 3270 Terminal emulator for GTK -License: GPL-2.0 +License: GPL-2.0-only Group: System/X11/Terminals -Url: https://github.com/PerryWerneck/pw3270 +URL: https://github.com/PerryWerneck/pw3270 Source: pw3270-%{version}.tar.xz +Patch0: fix-appdata-xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: shared-mime-info Requires: %{name}-branding = %{version} +Requires: shared-mime-info BuildRequires: update-desktop-files %glib2_gsettings_schema_requires -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libv3270) >= 5.3 BuildRequires: autoconf >= 2.61 +BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: binutils BuildRequires: coreutils BuildRequires: desktop-file-utils +BuildRequires: fdupes BuildRequires: findutils BuildRequires: gcc-c++ BuildRequires: gettext-devel @@ -56,8 +57,9 @@ BuildRequires: m4 BuildRequires: pkgconfig BuildRequires: sed -BuildRequires: fdupes -BuildRequires: autoconf-archive +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libv3270) >= 5.3 %glib2_gsettings_schema_requires %description @@ -72,6 +74,8 @@ Group: System/X11/Terminals Requires: %{name} = %{version} +BuildArch: noarch + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -98,6 +102,7 @@ %prep %setup +%patch0 -p1 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects NOCONFIGURE=1 ./autogen.sh @@ -138,7 +143,8 @@ %{_datadir}/%{_product}/icons/disconnect-*.svg %{_datadir}/applications/*.desktop -%{_datadir}/appdata/%{_product}.appdata.xml +%{_datadir}/appdata/*.appdata.xml +%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/mime/packages/*.xml ++++++ fix-appdata-xml.patch ++++++ diff -Naur a/branding/appdata.xml.in b/branding/appdata.xml.in --- a/branding/appdata.xml.in 2020-11-03 11:00:09.000000000 -0300 +++ b/branding/appdata.xml.in 2020-11-24 20:06:07.151075588 -0300 @@ -1,39 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + + References: + + https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps + https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf + https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/ + +--> + <component type="desktop"> - <id>br.com.bb.pw3270</id> - <name>3270 Terminal</name> - <name xml:lang="pt_BR">Terminal 3270</name> - <summary>IBM 3270 Terminal emulator</summary> - <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary> - <developer_name>[email protected]</developer_name> - <description> - <p> - GTK Based 3270 terminal emulator - pw3270 is a modern, GTK-based, completely free tn3270 emulator. - Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide. - </p> - </description> + <id>br.com.bb.@[email protected]</id> <metadata_license>CC0-1.0</metadata_license> <project_license>LGPL-3.0</project_license> - <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url> - <url type="homepage">https://github.com/PerryWerneck/pw3270</url> - <project_group>GNOME</project_group> + <name>@PRODUCT_NAME@</name> + <name xml:lang="pt_BR">@PRODUCT_NAME@</name> - <launchable type="desktop-id">@[email protected]</launchable> + <summary>IBM 3270 Terminal emulator</summary> + <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary> + + <developer_name>Perry Werneck</developer_name> + + <description> + <p>GTK Based 3270 terminal emulator</p> + <p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p> + <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p> + </description> + + <url type="homepage">https://github.com/PerryWerneck/pw3270</url> + <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url> <screenshots> <screenshot type="default"> <caption>@PRODUCT_NAME@</caption> - <image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270-logo.svg</image> + <image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270.svg</image> </screenshot> </screenshots> <update_contact>[email protected]</update_contact> + <project_group>GNOME</project_group> + <provides> - <id>@[email protected]</id> + <binary>@PRODUCT_NAME@</binary> </provides> + + <translation type="gettext">@PRODUCT_NAME@</translation> + </component> diff -Naur a/branding/launcher.desktop.in b/branding/launcher.desktop.in --- a/branding/launcher.desktop.in 2020-11-03 11:00:09.000000000 -0300 +++ b/branding/launcher.desktop.in 2020-11-24 20:06:07.151075588 -0300 @@ -1,12 +1,13 @@ [Desktop Entry] X-SuSE-translate=true GenericName=@PRODUCT_NAME@ +GenericName[pt_BR]=@PRODUCT_NAME@ Name=3270 Terminal Name[pt_BR]=Terminal 3270 Comment=IBM 3270 Terminal emulator Comment[pt_BR]=Emulador de terminal IBM 3270 Exec=@PRODUCT_NAME@ %u -Icon=/usr/share/@PRODUCT_NAME@/icons/@[email protected] +Icon=br.com.bb.@PRODUCT_NAME@ Terminal=false Type=Application StartupNotify=true diff -Naur a/branding/Makefile.in b/branding/Makefile.in --- a/branding/Makefile.in 2020-11-03 11:00:09.000000000 -0300 +++ b/branding/Makefile.in 2020-11-24 20:06:07.151075588 -0300 @@ -28,6 +28,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PRODUCT_NAME=@PRODUCT_NAME@ +APPLICATION_ID=br.com.bb.@PRODUCT_NAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -113,13 +114,13 @@ @$(INSTALL_DATA) \ launcher.desktop \ - $(PRODUCT_NAME).desktop + $(APPLICATION_ID).desktop @$(DESKTOP_INSTALL) \ --mode 644 \ --delete-original \ --dir $(DESTDIR)$(datarootdir)/applications \ - $(PRODUCT_NAME).desktop + $(APPLICATION_ID).desktop @$(MKDIR) $(DESTDIR)$(datarootdir)/mime/packages @@ -131,7 +132,13 @@ @$(INSTALL_DATA) \ appdata.xml \ - $(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml + $(DESTDIR)$(datarootdir)/appdata/$(APPLICATION_ID).appdata.xml + + @$(MKDIR) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps + + @$(INSTALL_DATA) \ + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/$(PRODUCT_NAME).svg \ + $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/$(APPLICATION_ID).svg install-windows: \ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \ _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
