From 8d5aa207d97932e58ff0c0351750e506d36579a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Fri, 20 Nov 2009 01:06:46 +0000 Subject: [PATCH 1/3] Initialize branch F-12 for wtop --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From f22a0eff7efd2044f4f20d4f141dda084e24bc02 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Fri, 27 Nov 2009 11:33:00 +0000 Subject: [PATCH 2/3] Importing for the first time in F-12 --- sources | 1 + wtop.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 wtop.spec diff --git a/sources b/sources index e69de29..07ddd29 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +cfaee42760c2b2661d2b60008f3719ba wtop-0.6.1.tar.gz diff --git a/wtop.spec b/wtop.spec new file mode 100644 index 0000000..f7b7227 --- /dev/null +++ b/wtop.spec @@ -0,0 +1,56 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: wtop +Version: 0.6.1 +Release: 2%{?dist} +Summary: Top for Webserver + +Group: Applications/Internet +License: BSD +URL: http://code.google.com/p/wtop/ +Source0: http://wtop.googlecode.com/files/%{name}-%{version}.tar.gz + +BuildArch: noarch +BuildRequires: python-devel, python-setuptools +Requires: python-GeoIP + +%description +Wtop like "top" for your webserver. + +%prep +%setup -q +sed -i -e "s|#!/usr/bin/python||" logrep.py +sed -i -e "s|/var/log/apache2/|/var/log/httpd/|" wtop.cfg + + +%build +%{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT + + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/wtop +%{_bindir}/logrep +%{python_sitelib}/*.egg-info +%{python_sitelib}/logrep.* +%config(noreplace) %{_sysconfdir}/wtop.cfg + + + + +%changelog +* Fri Nov 27 2009 Kushal Das 0.6.1-2 +- adding sed command in prep section + +* Fri Oct 30 2009 Kushal Das 0.6.1-1 +- Initial release From 074d562af0874a6ccec9da22dab7f8ba3507c786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:17 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 ea92e91..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wtop -# $Id$ -NAME := wtop -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12