diff --git a/.gitignore b/.gitignore index cefb493..e28870a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,15 @@ shutter-0.86.2.tar.gz /shutter-0.91.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-b089b93.tar.gz +/shutter-0.99.3.tar.gz +/shutter-0.99.4.tar.gz +/shutter-0.99.5.tar.gz +/shutter-66c21b2.tar.gz +/shutter-0.99.6.tar.gz +/shutter-21d0da3.tar.gz diff --git a/shutter-0.93.1-fix-semd-email.patch b/shutter-0.93.1-fix-semd-email.patch deleted file mode 100644 index cfd6415..0000000 --- a/shutter-0.93.1-fix-semd-email.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shutter-0.93.1/bin/shutter b/shutter-0.93.1/bin/shutter -index a0495d4..656cbe7 100755 ---- a/shutter-0.93.1/bin/shutter -+++ b/shutter-0.93.1/bin/shutter -@@ -6964,7 +6964,7 @@ else { - ); - } - else { -- push( @files_to_email, $session_screens{$key}->{'uri'}->to_string ); -+ push( @files_to_email, $session_screens{$key}->{'long'} ); - } - - my $mail_string = undef; diff --git a/shutter-appdata.patch b/shutter-appdata.patch new file mode 100644 index 0000000..cc4ac5f --- /dev/null +++ b/shutter-appdata.patch @@ -0,0 +1,11 @@ +--- share/appdata/shutter.appdata.xml.orig 2022-07-22 12:39:10.485167885 +0200 ++++ share/appdata/shutter.appdata.xml 2022-07-22 12:39:26.389109257 +0200 +@@ -3,7 +3,7 @@ + org.shutterproject.shutter + shutter.desktop + CC0-1.0 +- GPL-3.0+ ++ GPL-3.0+ + +

+ Shutter is a feature-rich screenshot program. You can take a screenshot of a diff --git a/shutter.spec b/shutter.spec index 5675fa2..a61b240 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,147 +1,320 @@ -Name: shutter -Version: 0.93.1 -Release: 1%{?dist} -Summary: GTK+2-based screenshot application written in Perl -Group: Applications/Multimedia -License: GPLv3+ -URL: http://shutter-project.org -Source0: http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{version}.tar.gz -# https://bugs.launchpad.net/shutter/+bug/1469840 -Patch0: shutter-0.93.1-fix-semd-email.patch -BuildArch: noarch -BuildRequires: desktop-file-utils -BuildRequires: perl -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires: gnome-web-photo +# For git snapshots, set to 0 to use release instead: +%global usesnapshot 1 +%if 0%{?usesnapshot} +%global commit0 21d0da3bd0e0b256cdfec83099fee87fbb62405f +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global snapshottag .git%{shortcommit0} %endif -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: perl(Goo::Canvas) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Name: shutter +%if 0%{?usesnapshot} +Version: 0.99.7 +Release: 0.2%{?snapshottag}%{?dist} +%else +Version: 0.99.6 +Release: 4%{?dist} +%endif -%{?filter_setup: -%filter_provides_in %{_datadir}/%{name}/resources/system/upload_plugins -%filter_setup -} +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 ) +# 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 +# Automatically converted from old format: GPLv3+ and GPLv2+ and GPLv2 and CC-BY-SA and MIT and CC0 and Public Domain - review is highly recommended. +License: GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND LicenseRef-Callaway-CC-BY-SA AND LicenseRef-Callaway-MIT AND CC0-1.0 AND LicenseRef-Callaway-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 +BuildRequires: gettext + +Requires: ImageMagick +Requires: tango-icon-theme +Requires: perl(X11::Protocol::Ext::XFIXES) +Requires: hicolor-icon-theme +Requires: libwnck3 +Requires: perl(Image::ExifTool) +Requires: perl(Goo::Canvas) +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra +%endif + + +# Filter all provides +%global __provides_exclude_from %{_datadir}/%{name}/resources/system/upload_plugins +# 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 covers all features of common command line tools like -scrot or import and adds reasonable new features combined -with a comfortable GUI using the GTK+ 2.x framework. - +Shutter is a feature-rich screenshot program for Linux based operating systems +such as Ubuntu. 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. %prep -%setup -q -n %{name}-%{version} -%patch0 -p 2 -rm -vr share/doc/ +%if 0%{?usesnapshot} + %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 $RPM_BUILD_ROOT%{_datadir} -install -d -m 0755 -p $RPM_BUILD_ROOT%{perl_vendorlib} -cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/ -cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/ -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/* \ - $RPM_BUILD_ROOT%{perl_vendorlib} -rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/ +install -d -m 0755 -p %{buildroot}%{_bindir} +install -d -m 0755 -p %{buildroot}%{_datadir} +install -d -m 0755 -p %{buildroot}%{perl_vendorlib} +cp -pfr bin/* %{buildroot}%{_bindir}/ +cp -pfr share/* %{buildroot}%{_datadir}/ +mv %{buildroot}%{_datadir}/%{name}/resources/modules/* \ + %{buildroot}%{perl_vendorlib} +rmdir %{buildroot}%{_datadir}/%{name}/resources/modules/ desktop-file-install --delete-original \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop -# Register as an application to be visible in the software center -# -# 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 < - - - - shutter.desktop - CC0-1.0 - -

- 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. -

-

- 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. -

-
- http://shutter-project.org/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/a.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/b.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/c.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shutter/d.png - - - -EOF +# fixes E: script-without-shebang +chmod 0644 %{buildroot}%{_datadir}/%{name}/resources/system/upload_plugins/upload/*.pm -%find_lang %{name} -%find_lang %{name}-plugins -cat %{name}-plugins.lang >> %{name}.lang -%find_lang %{name}-upload-plugins -cat %{name}-upload-plugins.lang >> %{name}.lang +%find_lang %{name} --all-name -%post -update-desktop-database &> /dev/null || : -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +# 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 -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : -fi +# linking tango-icon theme +ln -s %{_datadir}/icons/Tango/scalable %{buildroot}/%{_datadir}/shutter/resources/icons/drawing_tool/objects/Tango -%posttrans -/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metainfo.xml %files -f %{name}.lang -%doc CHANGES README COPYING +%doc CHANGES README +%license COPYING +%license %{_datadir}/%{name}/resources/license/* %{_bindir}/%{name} %{perl_vendorlib}/Shutter/ -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.metainfo.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 +* Fri Jul 17 2026 Fedora Release Engineering - 0.99.7-0.2.git21d0da3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Apr 25 2026 Martin Gansser - 0.99.7-0.1.git21d0da3 +- Update to 0.99.7-0.1.git21d0da3 +- Fixed .xpm cursor files to work with new glycin version + +* Sat Jan 17 2026 Fedora Release Engineering - 0.99.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.99.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jun 06 2025 Martin Gansser - 0.99.6-1 +- Update to 0.99.6-1 + +* Sun Jan 19 2025 Fedora Release Engineering - 0.99.6-0.3.git66c21b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Nov 06 2024 Martin Gansser - 0.99.6-0.2.git66c21b2 +- Add RR gdk-pixbuf2-modules-extra fix bug (#2323682) + +* Thu Oct 31 2024 Martin Gansser - 0.99.6-0.1.git66c21b2 +- Update to 0.99.6-0.1.git66c21b2 + +* Wed Sep 04 2024 Miroslav Suchý - 0.99.5-3 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.99.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Apr 27 2024 Martin Gansser - 0.99.5-1 +- Update to 0.99.5-1 + +* Sat Jan 27 2024 Fedora Release Engineering - 0.99.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.99.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Mar 25 2023 Martin Gansser - 0.99.4-1 +- Update to 0.99.4-1 + +* Mon Mar 06 2023 Martin Gansser - 0.99.3-1 +- Update to 0.99.3-1 + +* Fri Mar 03 2023 Martin Gansser - 0.99.3-0.1.gitb089b93 +- Update to 0.99.3-0.1.gitb089b93 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.99.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Martin Gansser - 0.99.2-4 +- Add %%{name}-appdata.patch to fix invalid tag in xml file (BZ#2109819) + +* Mon May 30 2022 Jitka Plesnikova - 0.99.2-3 +- Perl 5.36 rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.99.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Oct 26 2021 Martin Gansser - 0.99.2-1 +- Update to 0.99.2-1 + +* Mon Oct 18 2021 Martin Gansser - 0.99.1-1 +- Update to 0.99.1-1 + +* Sun Sep 05 2021 Martin Gansser - 0.99-2 +- Cleanup spec file + +* Sat Sep 04 2021 Martin Gansser - 0.99-1 +- Update to 0.99-1 + +* Tue Aug 31 2021 Martin Gansser - 0.98-6 +- Add RR libwnck3 needed by X11 + +* Thu Aug 19 2021 Martin Gansser - 0.98-5 +- Use plain "perl" instead of %%{__perl} macro +- Do not provide perl(Gtk3::IconSize) + +* Thu Aug 19 2021 Martin Gansser - 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 - 0.98-3 +- Unbundle tango-icon-theme +- Add RR tango-icon-theme + +* Thu Aug 05 2021 Martin Gansser - 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 - 0.98-1 +- Update to 0.98-1 + +* Tue Jun 22 2021 Martin Gansser - 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 - 0.94.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 26 2020 Jitka Plesnikova - 0.94.3-4 +- Perl 5.32 re-rebuild of bootstrapped packages + +* Mon Jun 22 2020 Jitka Plesnikova - 0.94.3-3 +- Perl 5.32 rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 0.94.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 09 2019 Till Maas - 0.94.3-1 +- Update to latest release with critical bug fix +- Remove outdated conditional +- Remove broken patch + +* Fri Jul 26 2019 Fedora Release Engineering - 0.93.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 0.93.1-13 +- Perl 5.30 rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.93.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.93.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Jitka Plesnikova - 0.93.1-10 +- Perl 5.28 rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.93.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Aug 05 2017 Rex Dieter - 0.93.1-8 +- use %%license, simplify %%find_lang +- ImageMagick missing from dependencies (#1435789) +- Shutter requires retired orphaned gnome-web-photo (#1436632) +- fix perl-interpretter/gnome-web-photo deps for epel + +* Thu Jul 27 2017 Fedora Release Engineering - 0.93.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 07 2017 Igor Gnatenko - 0.93.1-6 +- Rebuild due to bug in RPM (RHBZ #1468476) + +* Sun Jun 04 2017 Jitka Plesnikova - 0.93.1-5 +- Perl 5.26 rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.93.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun May 15 2016 Jitka Plesnikova - 0.93.1-3 +- Perl 5.24 rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.93.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 17 2015 Robin Lee - 0.93.1-1 - Update to 0.93.1 (BZ#1178438, BZ#1247730) - Requires perl(Gtk2::AppIndicator) (BZ#1228973) diff --git a/sources b/sources index 19806b6..949106c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -614602040851e4cba0778704304330a0 shutter-0.93.1.tar.gz +SHA512 (shutter-21d0da3.tar.gz) = 8431eea3b2316078baa7cd0423dba54575aa65b12e6aa946b3dfbbca61ddc230382d3d1ae14ff81aa8ae7895c405f0297bfd03617f6099e6328d6b6eeb9ace76