rpms/mailgraph/devel mailgraph.spec,1.7,1.8 paths.patch,1.1,1.2

[Bernard Johnson]

Author: bjohnson

Update of /cvs/pkgs/rpms/mailgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29941

Modified Files:
	mailgraph.spec paths.patch 
Log Message:
- fix patch fuzz



Index: mailgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailgraph/devel/mailgraph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mailgraph.spec	7 Mar 2008 01:52:59 -0000	1.7
+++ mailgraph.spec	1 Oct 2008 00:07:50 -0000	1.8
@@ -1,8 +1,13 @@
+# Only Fedora & RHEL 5+ can use selinux
+%if 0%{?rhel} && "%rhel" < "5"
+%define without_selinux 1
+%endif
+
 %define selinux_variants mls strict targeted
 
 Name:           mailgraph
 Version:        1.14
-Release:        2%{?dist}%{?repotag:.%{repotag}}
+Release:        3%{?dist}%{?repotag:.%{repotag}}
 Summary:        A RRDtool frontend for Mail statistics
 
 Group:          System Environment/Daemons
@@ -19,7 +24,9 @@
 Patch0:         paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if ! 0%{?without_selinux}
 BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
+%endif
 
 Requires:       perl(File::Tail), rrdtool, httpd
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -32,6 +39,7 @@
 Sendmail that produces daily, weekly, monthly and yearly graphs of
 received/sent and bounced/rejected mail.
 
+%if ! 0%{?without_selinux}
 %package selinux
 Summary:        A RRDtool frontend for Mail statistics
 
@@ -47,14 +55,17 @@
 
 %description selinux
 This is the selinux policy for mailgraph.
+%endif
 
 
 %prep
 %setup -q
 %patch0 -p1 -b .paths
 
+%if ! 0%{?without_selinux}
 mkdir selinux
 cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} ./selinux/
+%endif
 
 %build
 cd selinux
@@ -81,6 +92,7 @@
 %{__install} -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
 %{__install} -p -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/mailgraph
 
+%if ! 0%{?without_selinux}
 cd selinux
 for selinuxvariant in %{selinux_variants}; do
   install -d $RPM_BUILD_ROOT/%{_datadir}/selinux/${selinuxvariant}
@@ -91,6 +103,7 @@
 
 # Hardlink identical policy module packages together
 /usr/sbin/hardlink -cv $RPM_BUILD_ROOT/%{_datadir}/selinux
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,6 +127,7 @@
   /sbin/service %{name} condrestart 2>&1 > /dev/null || :
 fi
 
+%if ! 0%{?without_selinux}
 %post selinux
 /sbin/service %{name} status &> /dev/null ||:
 STATUS=$?
@@ -161,6 +175,7 @@
   [ -d %{_localstatedir}/cache/%{name} ] && \
     /sbin/restorecon -R %{_localstatedir}/cache/%{name} &> /dev/null || :
 fi
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -173,12 +188,17 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mailgraph.conf
 %doc CHANGES COPYING README
 
+%if ! 0%{?without_selinux}
 %files selinux
 %defattr(-,root,root,-)
 %{_datadir}/selinux/*/%{name}.pp
 %doc selinux/*
+%endif
 
 %changelog
+* Tue Sep 30 2008 Bernard Johnson <bjohnson at symetrix.com> - 1.14-3
+- fix patch fuzz
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.14-2
 Rebuild for new perl
 

paths.patch:

Index: paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mailgraph/devel/paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paths.patch	29 Jan 2007 21:09:14 -0000	1.1
+++ paths.patch	1 Oct 2008 00:07:50 -0000	1.2
@@ -1,6 +1,6 @@
---- mailgraph-1.12/mailgraph.cgi.orig	2005-10-16 13:17:00.000000000 -0400
-+++ mailgraph-1.12/mailgraph.cgi	2007-01-13 18:51:55.000000000 -0500
-@@ -15,9 +15,9 @@
+--- mailgraph-1.14/mailgraph.cgi.orig	2007-08-29 03:06:01.000000000 -0600
++++ mailgraph-1.14/mailgraph.cgi	2008-09-30 17:50:56.000000000 -0600
+@@ -16,9 +16,9 @@ my $xpoints = 540;
  my $points_per_sample = 3;
  my $ypoints = 160;
  my $ypoints_err = 96;
@@ -12,4 +12,4 @@
 +my $tmp_dir = '/var/cache/mailgraph'; # temporary directory where to store the images
  
  my @graphs = (
- 	{ title => 'Day Graphs',   seconds => 3600*24,        },
+ 	{ title => 'Last Day',   seconds => 3600*24,        },