From ee53473c8b904e7275355b87862f097f7cc7ceb0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 15 Jan 2009 20:13:57 +0000 Subject: [PATCH 1/5] Initialize branch F-10 for zapplet --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From d263096361ec17255aaaa81d9c4d412761fea5bb Mon Sep 17 00:00:00 2001 From: David Nalley Date: Fri, 16 Jan 2009 22:41:10 +0000 Subject: [PATCH 2/5] - Initial upload --- .cvsignore | 1 + README.fedora | 2 ++ import.log | 1 + sources | 1 + zapplet.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 README.fedora create mode 100644 import.log create mode 100644 zapplet.spec diff --git a/.cvsignore b/.cvsignore index e69de29..04ca0b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zapplet-0.1.tar.gz diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..fbba5cb --- /dev/null +++ b/README.fedora @@ -0,0 +1,2 @@ +To have Zapplet start on login use the following command as root: +'cp /usr/share/applications/zapplet.desktop /etc/xdg/autostart/zapplet.desktop' diff --git a/import.log b/import.log new file mode 100644 index 0000000..07e1726 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zapplet-0_1-3_fc10:F-10:zapplet-0.1-3.fc10.src.rpm:1232145562 diff --git a/sources b/sources index e69de29..6e419ba 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d12db237f805d6711d8d720080e06eaa zapplet-0.1.tar.gz diff --git a/zapplet.spec b/zapplet.spec new file mode 100644 index 0000000..dca873c --- /dev/null +++ b/zapplet.spec @@ -0,0 +1,50 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +Name: zapplet +Version: 0.1 +Release: 3%{dist} +Summary: Zenoss Tray Applet +Group: Applications/Communications +License: GPLv2+ +URL: http://zapplet.sourceforge.net +Source0: http://downloads.sourceforge.net/zapplet/zapplet-%{version}.tar.gz +Source1: http://ke4qqq.fedorapeople.org/zapplet/README.fedora +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python +BuildRequires: python-setuptools-devel +BuildRequires: desktop-file-utils +Requires: pygtk2 +BuildArch: noarch + +%description +Zapplet is a tray applet for monitoring aspects of Zenoss from the desktop. + +%prep +%setup -q -n zapplet-%{version} +cp %{SOURCE1} ./README.fedora +%build +CFLAGS="%{optflags}" %{__python} setup.py build + +%install +rm -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} + +desktop-file-install --add-category="Network" --dir=%{buildroot}%{_datadir}/applications zapplet.desktop +rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/zapplet.desktop + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%{python_sitelib}/* +%{_bindir}/%{name} +%{_datadir}/applications/zapplet.desktop +%doc README.fedora +%changelog +* Sun Dec 28 2008 David Nalley 0.1-3 +- Made changes suggested by Brian Pepple +* Sat Dec 27 2008 David Nalley 0.1-2 +- Making corrections suggested by Fabian Affolter +* Sun Dec 14 2008 David Nalley 0.1-1 +- Initial packaging efforts + From d7b968b7fb3859cf0801e0a5ea15b105eac3f689 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Mon, 19 Jan 2009 12:38:00 +0000 Subject: [PATCH 3/5] - Made changes suggested by ianweller to fix cvs issues --- import.log | 1 + zapplet.spec | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index 07e1726..0f708ab 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zapplet-0_1-3_fc10:F-10:zapplet-0.1-3.fc10.src.rpm:1232145562 +zapplet-0_1-4_fc10:F-10:zapplet-0.1-4.fc10.src.rpm:1232368578 diff --git a/zapplet.spec b/zapplet.spec index dca873c..59cf0d5 100644 --- a/zapplet.spec +++ b/zapplet.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zapplet Version: 0.1 -Release: 3%{dist} +Release: 4%{dist} Summary: Zenoss Tray Applet Group: Applications/Communications License: GPLv2+ @@ -41,6 +41,8 @@ rm -rf %{buildroot} %{_datadir}/applications/zapplet.desktop %doc README.fedora %changelog +* Mon Jan 19 2009 David Nalley 0.1-4 +- Made changes suggested by ianweller to fix cvs issues * Sun Dec 28 2008 David Nalley 0.1-3 - Made changes suggested by Brian Pepple * Sat Dec 27 2008 David Nalley 0.1-2 From 8c286009d5520f4d1028d070941f5c5183a34fd4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:48 +0000 Subject: [PATCH 4/5] 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 bd6cfac..d773f61 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := zapplet 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 1d954a49768d7559c0d27b510c5986cfeb62a112 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:37 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 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 d773f61..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zapplet -# $Id$ -NAME := zapplet -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 0f708ab..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -zapplet-0_1-3_fc10:F-10:zapplet-0.1-3.fc10.src.rpm:1232145562 -zapplet-0_1-4_fc10:F-10:zapplet-0.1-4.fc10.src.rpm:1232368578