diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore index e28870a..c1bee86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,4 @@ -shutter-0.86.2.tar.gz -/shutter-0.86.4.tar.gz -/shutter-0.87.2.tar.gz -/shutter-0.87.3.tar.gz -/shutter-0.89.tar.gz -/shutter-0.89.1.tar.gz -/shutter-0.90.tar.gz -/shutter-0.90.1.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/Makefile b/Makefile new file mode 100644 index 0000000..f3d2796 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: shutter +# $Id$ +NAME := shutter +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/shutter.spec b/shutter.spec index a61b240..98f27e0 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,29 +1,27 @@ # For git snapshots, set to 0 to use release instead: -%global usesnapshot 1 +%global usesnapshot 0 %if 0%{?usesnapshot} -%global commit0 21d0da3bd0e0b256cdfec83099fee87fbb62405f +%global commit0 01d8563a9b7453fa069da2c448e53b5eeff8592e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global snapshottag .git%{shortcommit0} %endif Name: shutter +Version: 0.99.2 %if 0%{?usesnapshot} -Version: 0.99.7 -Release: 0.2%{?snapshottag}%{?dist} +Release: 0.3%{?snapshottag}%{?dist} %else -Version: 0.99.6 Release: 4%{?dist} %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 ) # 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 +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 @@ -31,6 +29,8 @@ Source0: https://github.com/shutter-project/shutter/archive/%{commit0}/%{name Source0: https://github.com/shutter-project/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz %endif +Patch0: %{name}-appdata.patch + # https://bugs.launchpad.net/shutter/+bug/1469840 BuildArch: noarch @@ -51,10 +51,7 @@ Requires: hicolor-icon-theme Requires: libwnck3 Requires: perl(Image::ExifTool) Requires: perl(Goo::Canvas) -%if 0%{?fedora} >= 41 -Requires: gdk-pixbuf2-modules-extra -%endif - +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # Filter all provides %global __provides_exclude_from %{_datadir}/%{name}/resources/system/upload_plugins @@ -76,6 +73,7 @@ window. Shutter is free, open-source, and licensed under GPL v3. %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 @@ -100,6 +98,11 @@ chmod 0644 %{buildroot}%{_datadir}/%{name}/resources/system/upload_plugins/uploa %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 @@ -123,7 +126,7 @@ ln -s %{_datadir}/icons/Tango/scalable %{buildroot}/%{_datadir}/shutter/resource %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml %files -f %{name}.lang %doc CHANGES README @@ -131,7 +134,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metai %license %{_datadir}/%{name}/resources/license/* %{_bindir}/%{name} %{perl_vendorlib}/Shutter/ -%{_metainfodir}/%{name}.metainfo.xml +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} %{_mandir}/man1/%{name}* @@ -140,58 +143,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metai %{_datadir}/icons/HighContrast/ %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) diff --git a/sources b/sources index 949106c..e9765ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shutter-21d0da3.tar.gz) = 8431eea3b2316078baa7cd0423dba54575aa65b12e6aa946b3dfbbca61ddc230382d3d1ae14ff81aa8ae7895c405f0297bfd03617f6099e6328d6b6eeb9ace76 +SHA512 (shutter-0.99.2.tar.gz) = 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb