[munin/el6: 36/36] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 6d80b9ee2862b412b6d3d9fae15c2739415b5fbf
Merge: faf01a1 ab6bfbc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Aug 5 16:01:39 2011 -0600

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	munin.spec
    	sources
    
    Merge up with master branch and pick up 1.4.6 upstream bugfix release.

 .gitignore                   |    7 ++-
 munin-1.4.5-df-config        |    2 +
 munin-1.4.6.tar.gz.sha256sum |    1 +
 munin-node.service           |   11 +++
 munin.conf                   |    1 +
 munin.spec                   |  164 ++++++++++++++++++++++++++++++------------
 nf_conntrack                 |    5 --
 sources                      |    2 +-
 8 files changed, 139 insertions(+), 54 deletions(-)
---
diff --cc .gitignore
index 808158d,e2ee378..2d51cfd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,6 @@@
--munin-1.4.5.tar.gz
+ /munin-node.service
+ /munin-1.4.5.tar.gz
+ /munin-1.4.5-rundir-conf.patch
+ /munin.conf
+ /munin-1.4.5-no-such-object.patch
+ /munin-1.4.6.tar.gz
diff --cc munin.spec
index 1fa4145,e6e3acc..592bb65
--- a/munin.spec
+++ b/munin.spec
@@@ -127,17 -133,15 +133,16 @@@ java-plugins for munin-node
  
  %prep
  %setup -q
- %patch1 -p1
- %if 0%{?rhel} == 5
+ %if 0%{?rhel} < 6 && 0%{?fedora} < 11
  %patch2 -p0
  %endif
- %patch3 -p1
  
  %build
- %if 0%{?rhel} == 5 || 0%{?fedora} > 6
+ %if 0%{?rhel} > 4 || 0%{?fedora} > 6
  export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
++export JAVALIBDIR=/usr/share/java/
  %endif
- make 	CONFIG=dists/redhat/Makefile.config
+ make    CONFIG=dists/redhat/Makefile.config
  
  %install