From db62b7b133b323631fe0876b146e12fb56ead259 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 11 Aug 2009 05:14:48 +0000 Subject: [PATCH 01/10] Initialize branch F-11 for shutter --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 08694fcee372a0278a707164d574cf0f9ee05c93 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Tue, 11 Aug 2009 06:35:00 +0000 Subject: [PATCH 02/10] Liang Suilong's Update --- .cvsignore | 1 + import.log | 1 + shutter.spec | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 121 insertions(+) create mode 100644 import.log create mode 100644 shutter.spec diff --git a/.cvsignore b/.cvsignore index e69de29..c8f695f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +shutter-0.80.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..41945c2 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +shutter-0_80_1-1_fc11:F-11:shutter-0.80.1-1.fc11.src.rpm:1249972437 diff --git a/shutter.spec b/shutter.spec new file mode 100644 index 0000000..1cf31cd --- /dev/null +++ b/shutter.spec @@ -0,0 +1,118 @@ +#%define ppa_version ppa6 +Name: shutter +Version: 0.80.1 +Release: 1%{?dist} +Summary: GTK+ 2.0 screenshot application written in perl +Group: Applications/Multimedia +License: GPL+ or Artistic +URL: http://shutter-project.org +Source0: http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils +Requires: gnome-web-photo, gtklp +Requires: perl(Gtk2::ImageView) +Requires: perl(X11::Protocol) + +%description +Shutter is a GTK+ 2.0 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.0 framework + + +%prep +%setup -q -n %{name}-%{version} +rm -rf share/app-install/ +rm -rf share/shutter/resources/po/ +rm -rf share/shutter/resources/modules/{File,Net,Proc,Sort,X11} +rm -rf share/doc + +%build + +%install +rm -rf $RPM_BUILD_ROOT +# executable and data +install -d -m 0755 -p $RPM_BUILD_ROOT%{_bindir} +install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir} +cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/ +cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/ + +desktop-file-install --delete-original \ + --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}.desktop + +%find_lang %{name} +%find_lang %{name}-plugins +cat %{name}-plugins.lang >> %{name}.lang + +%post +update-desktop-database %{_datadir}/applications &>/dev/null || : + + +%postun +update-desktop-database %{_datadir}/applications &>/dev/null || : + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc README COPYING +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name} +%{_mandir}/man1/%{name}* +%{_datadir}/pixmaps/ + + +%changelog +* Mon Aug 3 2009 Liang Suilong - 0.80.1-1 +- Updrade to shutter-0.80.1 + +* Mon Aug 3 2009 Liang Suilong - 0.80-5 +- Update %%install script + +* Wed Jul 29 2009 Liang Suilong - 0.80-4 +- Update %%install script + +* Mon Jul 20 2009 Liang Suilong - 0.80-3 +- Add perl(X11::Protocol) as require + +* Thu Jun 25 2009 Liang Suilong - 0.80-2 +- Upstream to shutter-0.80 Final GA + +* Thu Jun 25 2009 Liang Suilong - 0.80-1.ppa6 +- Upstream to shutter-0.80~ppa6 +- Update the SPEC file + +* Thu Jun 25 2009 Liang Suilong - 0.70.2-3.ppa4 +- Remove share/shutter/resources/pofiles/ +- Remove share/shutter/resources/modules/File +- Remove share/shutter/resources/pofiles/Proc + +* Wed Apr 15 2009 Liang Suilong - 0.70.2-2.ppa4 +- Add a desktop-file-utils as BuildRequires + +* Wed Apr 15 2009 Liang Suilong - 0.70.2-2.ppa3 +- Add a desktop-file-utils as BuildRequires + +* Sun Jan 18 2009 Liang Suilong - 0.70.2-1 +- Upstream to 0.70.2 + +* Sun Jan 18 2009 Liang Suilong - 0.70.1-1 +- Upstream to 0.70.1 + +* Sun Jan 18 2009 Liang Suilong - 0.70-1 +- Upstream to 0.70 + +* Sun Jan 18 2009 Liang Suilong - 0.64-2 +- Add several Requires so that advanced functions can run. +- Fix the authoritie of install path. + +* Fri Jan 02 2009 bbbush - 0.64-1 +- update to 0.64, clean up spec + +* Mon Dec 29 2008 Liang Suilong - 0.63-3 +- Initial package for Fedora diff --git a/sources b/sources index e69de29..cf44cc8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fe328193f496847f0a563f294eed0b1f shutter-0.80.1.tar.gz From d64bc42cc91da66223e7c9f6e41942e76bbbf81c Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 16 Aug 2009 05:58:28 +0000 Subject: [PATCH 03/10] *** empty log message *** --- shutter.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shutter.spec b/shutter.spec index 1cf31cd..25b290c 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,7 +1,7 @@ #%define ppa_version ppa6 Name: shutter Version: 0.80.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia License: GPL+ or Artistic @@ -10,7 +10,7 @@ Source0: http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{v BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -Requires: gnome-web-photo, gtklp +Requires: gnome-web-photo Requires: perl(Gtk2::ImageView) Requires: perl(X11::Protocol) @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 16 2009 Liang Suilong - 0.80.1-2 +- Remove requires: gtklp + * Mon Aug 3 2009 Liang Suilong - 0.80.1-1 - Updrade to shutter-0.80.1 From a5ea5a9b9d9a5bf41277a03b6cb87a1f569d17d2 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Mon, 23 Nov 2009 05:00:01 +0000 Subject: [PATCH 04/10] import Liang's Update --- .cvsignore | 2 +- import.log | 1 + shutter.spec | 11 ++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8f695f..a12194b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -shutter-0.80.1.tar.gz +shutter-0.85.tar.gz diff --git a/import.log b/import.log index 41945c2..64dae98 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ shutter-0_80_1-1_fc11:F-11:shutter-0.80.1-1.fc11.src.rpm:1249972437 +shutter-0_85-1_fc12:F-11:shutter-0.85-1.fc12.src.rpm:1258952422 diff --git a/shutter.spec b/shutter.spec index 25b290c..67cff8d 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,7 +1,7 @@ #%define ppa_version ppa6 Name: shutter -Version: 0.80.1 -Release: 2%{?dist} +Version: 0.85 +Release: 1%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia License: GPL+ or Artistic @@ -10,9 +10,10 @@ Source0: http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{v BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -Requires: gnome-web-photo +Requires: gnome-web-photo, gtklp Requires: perl(Gtk2::ImageView) Requires: perl(X11::Protocol) +Requires: nautilus-sendto %description Shutter is a GTK+ 2.0 screenshot application written in perl. @@ -68,8 +69,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Aug 16 2009 Liang Suilong - 0.80.1-2 -- Remove requires: gtklp +* Sat Nov 21 2009 Liang Suilong - 0.85-1 +- Upgrade to shutter-0.85 * Mon Aug 3 2009 Liang Suilong - 0.80.1-1 - Updrade to shutter-0.80.1 diff --git a/sources b/sources index cf44cc8..6848330 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe328193f496847f0a563f294eed0b1f shutter-0.80.1.tar.gz +f0fc2d20695b65f22d5489217407cb60 shutter-0.85.tar.gz From c5aff7221d9ffbb1bd862cd325eab01cc52b5080 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:38 +0000 Subject: [PATCH 05/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f3d2796..9786475 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4e756b45d664ca114fdf2476e107d8daa13692c3 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Mon, 7 Dec 2009 13:17:40 +0000 Subject: [PATCH 06/10] *** empty log message *** --- .cvsignore | 1 + shutter.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index a12194b..ae349f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ shutter-0.85.tar.gz +shutter-0.85.1.tar.gz diff --git a/shutter.spec b/shutter.spec index 67cff8d..f9cacbe 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,6 +1,6 @@ #%define ppa_version ppa6 Name: shutter -Version: 0.85 +Version: 0.85.1 Release: 1%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia @@ -66,9 +66,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name} %{_mandir}/man1/%{name}* %{_datadir}/pixmaps/ - +%{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Mon Dec 7 2009 Liang Suilong - 0.85.1-1 +- Upgrade to shutter-0.85.1 + * Sat Nov 21 2009 Liang Suilong - 0.85-1 - Upgrade to shutter-0.85 diff --git a/sources b/sources index 6848330..8cfbd6b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f0fc2d20695b65f22d5489217407cb60 shutter-0.85.tar.gz +65523d7b3199ac1d03c1577e68725e36 shutter-0.85.1.tar.gz From 599d202e7ed0ab0afecb3239c00798bb81547e45 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Tue, 2 Mar 2010 11:58:16 +0000 Subject: [PATCH 07/10] *** empty log message *** --- shutter.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shutter.spec b/shutter.spec index f9cacbe..2ed24e2 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,7 +1,7 @@ #%define ppa_version ppa6 Name: shutter Version: 0.85.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia License: GPL+ or Artistic @@ -65,10 +65,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} %{_mandir}/man1/%{name}* -%{_datadir}/pixmaps/ +%{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Mon Mar 2 2010 Liang Suilong - 0.85.1-2 +- Remove BR:gtklp +- fix the bug of directory ownership + * Mon Dec 7 2009 Liang Suilong - 0.85.1-1 - Upgrade to shutter-0.85.1 From f4e2cc8b45c6e5078d3282b550f687cda9b48b97 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Mon, 19 Apr 2010 13:21:28 +0000 Subject: [PATCH 08/10] *** empty log message *** --- .cvsignore | 1 + shutter.spec | 9 ++++++--- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae349f7..24d91ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ shutter-0.85.tar.gz shutter-0.85.1.tar.gz +shutter-0.86.1.tar.gz diff --git a/shutter.spec b/shutter.spec index 2ed24e2..62b34fb 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,7 +1,7 @@ #%define ppa_version ppa6 Name: shutter -Version: 0.85.1 -Release: 2%{?dist} +Version: 0.86.1 +Release: 1%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia License: GPL+ or Artistic @@ -10,7 +10,7 @@ Source0: http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{v BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -Requires: gnome-web-photo, gtklp +Requires: gnome-web-photo Requires: perl(Gtk2::ImageView) Requires: perl(X11::Protocol) Requires: nautilus-sendto @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Mon Apr 19 2010 Liang Suilong - 0.86.1-1 +- Upgrade to shutter-0.86.1 + * Mon Mar 2 2010 Liang Suilong - 0.85.1-2 - Remove BR:gtklp - fix the bug of directory ownership diff --git a/sources b/sources index 8cfbd6b..3beb2aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ f0fc2d20695b65f22d5489217407cb60 shutter-0.85.tar.gz 65523d7b3199ac1d03c1577e68725e36 shutter-0.85.1.tar.gz +8aedb68042337c8cc2ed46d7bf8d3b03 shutter-0.86.1.tar.gz From fc7d18b269b9e66aee05fb4c4dbe707b09bf24eb Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Thu, 6 May 2010 15:05:33 +0000 Subject: [PATCH 09/10] IMport Liang's update --- .cvsignore | 4 +--- import.log | 1 + shutter.spec | 7 ++++++- sources | 4 +--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 24d91ec..1739fc4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -shutter-0.85.tar.gz -shutter-0.85.1.tar.gz -shutter-0.86.1.tar.gz +shutter-0.86.2.tar.gz diff --git a/import.log b/import.log index 64dae98..96a1ea5 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ shutter-0_80_1-1_fc11:F-11:shutter-0.80.1-1.fc11.src.rpm:1249972437 shutter-0_85-1_fc12:F-11:shutter-0.85-1.fc12.src.rpm:1258952422 +shutter-0_86_2-1_fc12:F-11:shutter-0.86.2-1.fc12.src.rpm:1273158356 diff --git a/shutter.spec b/shutter.spec index 62b34fb..1fc50e0 100644 --- a/shutter.spec +++ b/shutter.spec @@ -1,6 +1,6 @@ #%define ppa_version ppa6 Name: shutter -Version: 0.86.1 +Version: 0.86.2 Release: 1%{?dist} Summary: GTK+ 2.0 screenshot application written in perl Group: Applications/Multimedia @@ -14,6 +14,7 @@ Requires: gnome-web-photo Requires: perl(Gtk2::ImageView) Requires: perl(X11::Protocol) Requires: nautilus-sendto +Requires: hicolor-icon-theme %description Shutter is a GTK+ 2.0 screenshot application written in perl. @@ -69,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu May 05 2010 Liang Suilong - 0.86.2-1 +- Upgrade to shutter-0.86.2 +- Add BR: hicolor-icon-theme + * Mon Apr 19 2010 Liang Suilong - 0.86.1-1 - Upgrade to shutter-0.86.1 diff --git a/sources b/sources index 3beb2aa..a44cb54 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -f0fc2d20695b65f22d5489217407cb60 shutter-0.85.tar.gz -65523d7b3199ac1d03c1577e68725e36 shutter-0.85.1.tar.gz -8aedb68042337c8cc2ed46d7bf8d3b03 shutter-0.86.1.tar.gz +7261c53d5e36b0c7c32aaba2a3714384 shutter-0.86.2.tar.gz From 936dd8a5ff5b41441f3f826fd8f71e67fe2fb519 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:46:00 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 3 --- 4 files changed, 25 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9786475..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# 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 $$d/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/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 96a1ea5..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -shutter-0_80_1-1_fc11:F-11:shutter-0.80.1-1.fc11.src.rpm:1249972437 -shutter-0_85-1_fc12:F-11:shutter-0.85-1.fc12.src.rpm:1258952422 -shutter-0_86_2-1_fc12:F-11:shutter-0.86.2-1.fc12.src.rpm:1273158356