Update to 0.99.2-1

Do not provide perl(Gtk3::IconSize)

.gitignore

@@ -10,3 +10,7 @@ shutter-0.86.2.tar.gz
 /shutter-0.93.tar.gz
 /shutter-0.93.1.tar.gz
 /shutter-0.94.3.tar.gz
+/shutter-0.98.tar.gz
+/shutter-0.99.tar.gz
+/shutter-0.99.1.tar.gz
+/shutter-0.99.2.tar.gz

shutter.spec

@@ -1,128 +1,201 @@
+# For git snapshots, set to 0 to use release instead:
+%global usesnapshot 0
+%if 0%{?usesnapshot}
+%global commit0 01d8563a9b7453fa069da2c448e53b5eeff8592e
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global snapshottag .git%{shortcommit0}
+%endif
+
 Name:       shutter
-Version:    0.94.3
+Version:    0.99.2
-Release:    5%{?dist}
+%if 0%{?usesnapshot}
-Summary:    GTK+2-based screenshot application written in Perl
+Release:    0.1%{?snapshottag}%{?dist}
-License:    GPLv3+
+%else
-URL:        http://shutter-project.org
+Release:    1%{?dist}
-Source0:    https://launchpad.net/shutter/0.9x/%{version}/+download/shutter-%{version}.tar.gz
+%endif
+Summary:    GTK+3-based screenshot application written in Perl
+
+# share/shutter/resources/icons/draw.svg packaged is CC-BY-SA
+# share/shutter/resources/system/plugins/perl/spwatermark/spwatermark.svg is Public Domain
+# share/shutter/resources/po/shutter/zh_TW.po is MIT (same as gscrot <https://github.com/gscrot/gscrot/blob/master/LICENSE.md>)
+# share/shutter/resources/icons/drawing_tool/objects/tux.svg is GPLv2
+# share/shutter/resources/icons/drawing_tool/cursor files are GPLv2+
+# share/appdata/shutter.appdata.xml is CC0
+License:    GPLv3+ and GPLv2+ and GPLv2 and CC-BY-SA and MIT and CC0 and Public Domain
+URL:        https://shutter-project.org/
+%if 0%{?usesnapshot}
+Source0:    https://github.com/shutter-project/shutter/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+%else
+Source0:    https://github.com/shutter-project/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+%endif
+
 # https://bugs.launchpad.net/shutter/+bug/1469840
 BuildArch:  noarch
+
 BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+BuildRequires:  coreutils
+BuildRequires:  sed
 %if 0%{?fedora}
 BuildRequires:  perl-interpreter
 %endif
 BuildRequires:  perl-generators
-Requires:   ImageMagick
+BuildRequires:  gettext
-Requires:   perl(Gtk2::ImageView)
-Requires:   perl(X11::Protocol::Ext::XFIXES)
-Requires:   nautilus-sendto
-Requires:   hicolor-icon-theme
-Requires:   perl(Gtk2::Unique)
-Requires:   perl(Gtk2::AppIndicator)
 
-Requires:   perl(Image::ExifTool)
+Requires:       ImageMagick
-Requires:   perl(Goo::Canvas)
+Requires:       tango-icon-theme
-Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(X11::Protocol::Ext::XFIXES)
+Requires:       hicolor-icon-theme
+Requires:       libwnck3
+Requires:       perl(Image::ExifTool)
+Requires:       perl(Goo::Canvas)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
-%{?filter_setup:
+# Filter all provides  
-%filter_provides_in %{_datadir}/%{name}/resources/system/upload_plugins
+%global __provides_exclude_from %{_datadir}/%{name}/resources/system/upload_plugins
-%filter_setup
+# Do not provide perl(Gtk3::IconSize)
-}
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Gtk3::IconSize\\)
 
 %description
-Shutter is a GTK+ 2.x based screenshot application written in Perl.
+Shutter is a feature-rich screenshot program for Linux based operating systems
-Shutter covers all features of common command line tools like
+such as Ubuntu. You can take a screenshot of a specific area, window, your whole
-scrot or import and adds reasonable new features combined
+screen, or even of a website – apply different effects to it, draw on it to
-with a comfortable GUI using the GTK+ 2.x framework.
+highlight points, and then upload to an image hosting site, all within one
-
+window. Shutter is free, open-source, and licensed under GPL v3.
 
 %prep
-%setup -q -n %{name}-%{version}
+%if 0%{?usesnapshot}
-rm -vr share/doc/
+  %autosetup -n %{name}-%{commit0}
+%else
+  %autosetup -p0 -n %{name}-%{version}
+%endif
 # Remove the bundled perl(X11::Protocol::Ext::XFIXES)
 rm -vr share/%{name}/resources/modules/X11
 rm -vr share/%{name}/resources/modules/WebService
 
 %build
+./po2mo.sh
 
 %install
 # executable and data
-install -d -m 0755 -p $RPM_BUILD_ROOT%{_bindir}
+install -d -m 0755 -p %{buildroot}%{_bindir}
-install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir}
+install -d -m 0755 -p %{buildroot}%{_datadir}
-install -d -m 0755 -p $RPM_BUILD_ROOT%{perl_vendorlib}
+install -d -m 0755 -p %{buildroot}%{perl_vendorlib}
-cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/
+cp -pfr bin/* %{buildroot}%{_bindir}/
-cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/
+cp -pfr share/* %{buildroot}%{_datadir}/
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/* \
+mv %{buildroot}%{_datadir}/%{name}/resources/modules/* \
-   $RPM_BUILD_ROOT%{perl_vendorlib}
+   %{buildroot}%{perl_vendorlib}
-rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/
+rmdir %{buildroot}%{_datadir}/%{name}/resources/modules/
 
 desktop-file-install --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-# Register as an application to be visible in the software center
+# fixes E: script-without-shebang
-#
+chmod 0644 %{buildroot}%{_datadir}/%{name}/resources/system/upload_plugins/upload/*.pm
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://answers.launchpad.net/shutter/+question/235216
-SentUpstream: 2013-09-06
--->
-<application>
-  <id type="desktop">shutter.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <description>
-    <p>
-      Shutter is a feature-rich screenshot program. You can take a screenshot of a
-      specific area, window, your whole screen, or even of a website - apply different
-      effects to it, draw on it to highlight points, and then upload to an image
-      hosting site, all within one window.
-      Shutter is free, open-source, and licensed under GPL v3.
-    </p>
-    <p>
-      Shutter allows you to capture nearly anything on your screen without losing
-      control over your screenshots (tabbed interface).
-      You don't need to open an external graphics editor like GIMP, because Shutter
-      ships with its own built-in editor.
-    </p>
-  </description>
-  <url type="homepage">http://shutter-project.org/</url>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/a.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/b.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/c.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/d.png</screenshot>
-  </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
 
 %find_lang %{name} --all-name
 
+# Install AppData
+mkdir -p %{buildroot}%{_metainfodir}/
+cp share/appdata/shutter.appdata.xml %{buildroot}%{_metainfodir}/shutter.appdata.xml
+rm %{buildroot}/%{_datadir}/appdata/shutter.appdata.xml
+
+# Symlink duplicated files
+rm %{buildroot}%{_datadir}/icons/HighContrast/scalable/apps/shutter-panel.svg
+ln -s %{_datadir}/icons/HighContrast/scalable/apps/shutter.svg %{buildroot}%{_datadir}/icons/HighContrast/scalable/apps/shutter-panel.svg
+rm %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/shutter-panel.png
+ln -s %{_datadir}/icons/hicolor/16x16/apps/shutter.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/shutter-panel.png
+rm %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/shutter-panel.png
+ln -s %{_datadir}/icons/hicolor/22x22/apps/shutter.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/shutter-panel.png
+rm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/shutter.png
+ln -s %{_datadir}/icons/hicolor/32x32/apps/shutter.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/shutter-panel.png
+rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/shutter-panel.svg 
+ln -s %{_datadir}/icons/hicolor/scalable/apps/shutter.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/shutter-panel.svg
+rm %{buildroot}%{_datadir}/shutter/resources/icons/Image.svg
+ln -s %{_datadir}/shutter/resources/icons/drawing_tool/draw-image.svg %{buildroot}%{_datadir}/shutter/resources/icons/Image.svg
+rm %{buildroot}%{_datadir}/shutter/resources/icons/Normal.cur
+ln -s %{_datadir}/shutter/resources/icons/drawing_tool/objects/Cursors/Normal.cur %{buildroot}%{_datadir}/shutter/resources/icons/Normal.cur
+rm %{buildroot}%{_datadir}/shutter/resources/icons/drawing_tool/cursor/backtext
+ln -s %{_datadir}/shutter/resources/icons/drawing_tool/cursor/text %{buildroot}%{_datadir}/shutter/resources/icons/drawing_tool/cursor/backtext
+
+# linking tango-icon theme
+ln -s %{_datadir}/icons/Tango/scalable %{buildroot}/%{_datadir}/shutter/resources/icons/drawing_tool/objects/Tango
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml
+
 %files -f %{name}.lang
 %doc CHANGES README
 %license COPYING
+%license %{_datadir}/%{name}/resources/license/*
 %{_bindir}/%{name}
 %{perl_vendorlib}/Shutter/
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_metainfodir}/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/*/apps/*.*
 %{_datadir}/icons/HighContrast/
-%{_datadir}/icons/ubuntu-mono-*/*/apps/%{name}-panel.*
 
 %changelog
+* Tue Oct 26 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.99.2-1
+- Update to 0.99.2-1
+
+* Mon Oct 18 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.99.1-1
+- Update to 0.99.1-1
+
+* Sun Sep 05 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.99-2
+- Cleanup spec file
+
+* Sat Sep 04 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.99-1
+- Update to 0.99-1
+
+* Tue Aug 31 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-6
+- Add RR libwnck3 needed by X11
+
+* Thu Aug 19 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-5
+- Use plain "perl" instead of %%{__perl} macro
+- Do not provide perl(Gtk3::IconSize)
+
+* Thu Aug 19 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-4
+- Move %%global __provides_exclude_from above the description section
+- Add share/shutter/resources/icons/drawing_tool/cursor files are GPLv2+
+- List the licenses of all the packaged files into the License section
+- Creating symbolic links (ln -s) instead of hard links in the %%install section
+- Do not explicitly run-require perl(GooCanvas2::CairoTypes) and perl(Gtk3::ImageView)
+  they are found automatically.
+- Do not run-require perl-Pango. It is found as perl(Pango) automatically
+
+* Sun Aug 08 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-3
+- Unbundle tango-icon-theme
+- Add RR tango-icon-theme
+
+* Thu Aug 05 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-2
+- Update URL 
+- Use a description from About
+- Declare license files
+- Add Provides bundled(tango-icon-theme)
+- Do not use %%filter_provides_in use %%__provides_exclude_from
+- Add BR libappstream-glib
+- Add BR coreutils
+- Add BR sed
+- Move icons into the correct directory
+- Symlink duplicated files
+- Filter all provides
+
+* Wed Aug 04 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.98-1
+- Update to 0.98-1
+
+* Tue Jun 22 2021 Martin Gansser <martinkg@fedoraproject.org> - 0.97-0.1.git01d8563
+- Update to 0.97-0.1.git01d8563
+- Add RR perl(Gtk3::ImageView)
+- Add RR perl(Goo::Canvas)
+- Add RR perl(GooCanvas2::CairoTypes)
+- Add RR perl-Pango
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.94.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (shutter-0.94.3.tar.gz) = 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
+SHA512 (shutter-0.99.2.tar.gz) = 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb