From f2600e3cf1a57010c5699ec73e468745472a2ad9 Mon Sep 17 00:00:00 2001 From: aquarius Date: Sat, 5 Jan 2008 14:01:19 +0000 Subject: [PATCH 1/1] updated Makefile and prometheus.spec to include manpages, crontab file and also updated their release to 0.7.7 git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@35 251d49ef-1d17-4917-a970-b30cf55b089b --- Makefile | 15 ++++++++++----- prometheus.spec | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 782989c..31be395 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,21 @@ VERSION=0.7.7 CFLAGS=-Wall prefix=/usr mandir=$(prefix)/share/man -bindir=$(prefix)/sbin -crondir=/etc/cron.d +sbindir=$(prefix)/sbin +sysconfdir=/etc/ main: prometheus $(CC) -o prometheus prometheus.c install: main - install -d $(bindir) - install -m 755 prometheus $(bindir) - install -m 755 sample_config/prometheus.cron $(crondir)/prometheus + install -d $(sbindir) + install -d $(mandir)/man1 + install -d $(mandir)/man5 + install -d $(sysconfdir)/cron.d + install -m 755 prometheus $(sbindir) + install -m 644 prometheus.1 $(mandir)/man1 + install -m 644 prometheus.conf.5 $(mandir)/man5 + install -m 755 sample-configuration/prometheus.cron $(sysconfdir)/cron.d/prometheus clean: rm -f prometheus diff --git a/prometheus.spec b/prometheus.spec index cfc54ab..bfe62e8 100644 --- a/prometheus.spec +++ b/prometheus.spec @@ -1,14 +1,14 @@ Summary: Traffic shaper replacement for Internet Service Providers (ISP). Name: prometheus Version: 0.7.7 -Release: 1 +Release: 2 License: GPL Vendor: Arachne Labs http://www.arachne.cz Packager: Tomas Lastovicka Group: Applications/System Source0: http://gpl.arachne.cz/download/%name-%version.tar.gz URL: http://gpl.arachne.cz -Requires: iptables, iproute +Requires: iptables, iproute, screen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -36,6 +36,9 @@ make %{_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man5 +mkdir -p %{buildroot}%{_sysconfdir}/cron.d/ %makeinstall @@ -45,8 +48,15 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %{_sbindir}/prometheus +%{_mandir}/man1/prometheus.1* +%{_mandir}/man5/prometheus.conf.5* +%{_sysconfdir}/cron.d/prometheus %changelog +* Sat Jan 5 2008 Tomas Lastovicka 0.7.7-2 +- added manual pages +- added crontab file + * Fri Dec 28 2007 Tomas Lastovicka 0.7.7-1 - update to latest upstream upstream 0.7.7 -- 2.30.2