Skip to content
Browse files

added proper support for appending "dist" to rpm name, eg: .el5, .el6

  • Loading branch information...
1 parent 47a3fe2 commit 9435523e980a4ebc733c57325f337074ffbbc259 @joemiller joemiller committed Jan 20, 2012
Showing with 5 additions and 4 deletions.
  1. +4 −3 build.sh
  2. +1 −1 runit.spec
View
7 build.sh
@@ -2,9 +2,10 @@
whereami=$(dirname $0)
-if [ ! -f "$(which rpmbuild)" ]; then echo "please install 'rpm-build' package and try again" ; exit 1 ; fi
-if [ ! -f "$(which spectool)" ]; then echo "please install 'rpmdevtools' package and try again" ; exit 1 ; fi
-if [ ! -f "$(which rpmdev-setuptree)" ]; then echo "please install 'rpmdevtools' package and try again" ; exit 1 ; fi
+if [ ! -f "/etc/rpm/macros.dist" ]; then echo "please install 'buildsys-macros' rpm and try again" ; exit 1 ; fi
+if [ ! -f "$(which rpmbuild)" ]; then echo "please install 'rpm-build' rpm and try again" ; exit 1 ; fi
+if [ ! -f "$(which spectool)" ]; then echo "please install 'rpmdevtools' rpm and try again" ; exit 1 ; fi
+if [ ! -f "$(which rpmdev-setuptree)" ]; then echo "please install 'rpmdevtools' rpm and try again" ; exit 1 ; fi
# creates ~/rpmbuild
/usr/bin/rpmdev-setuptree
View
2 runit.spec
@@ -8,7 +8,7 @@
Name: runit
Version: 2.1.1
-Release: 6%{?_with_dietlibc:diet}%{?el5:.el5}%{?el6:.el6}
+Release: 6%{?_with_dietlibc:diet}%{?dist}
Group: System/Base
License: BSD

0 comments on commit 9435523

Please sign in to comment.
Something went wrong with that request. Please try again.