build fixes for rpm

mrw-c++.spec.in

@@ -1,13 +1,13 @@
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: 1
+Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
 BuildRequires: subversion, automake, autoconf, doxygen, graphviz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver}
 BuildRequires: pkgconfig, cppunit-devel, mscgen, redhat-lsb
 %else%if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: pkg-config, libcppunit-devel, lsb-release