Merged branches/issue-5:907-908 into trunk.

Fixes issue 5.
dun · Feb 4, 2011 · 6d5f98a · 6d5f98a
2 parents e9efd45 + 1707418
commit 6d5f98a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-03  Chris Dunlap  <cdunlap@llnl.gov>
+
+	* munge.spec: Fixed RPM spec file for openSUSE.  (issue 5)
+
 2011-01-26  Chris Dunlap  <cdunlap@llnl.gov>
 
 	* : Fixed a potential deadlock in munged that can occur if clients

diff --git a/munge.spec b/munge.spec
@@ -9,9 +9,21 @@ Group:		System Environment/Daemons
 License:	GPLv3+ and LGPLv3+
 URL:		http://munge.googlecode.com/
 
+%if 0%{?suse_version} >= 1100
+BuildRequires:	libbz2-devel
+BuildRequires:	libopenssl-devel
+BuildRequires:	zlib-devel
+%else
+%if 0%{?sles_version} || 0%{?suse_version}
+BuildRequires:	bzip2
 BuildRequires:	openssl-devel
+BuildRequires:	zlib-devel
+%else
 BuildRequires:	bzip2-devel
+BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
+%endif
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 
 Source0:	%{name}-%{version}.tar