diff --git a/Makefile b/Makefile index 0b8c5e3..6d9c471 100644 --- a/Makefile +++ b/Makefile @@ -57,5 +57,5 @@ cvsclean: mrproper pack: mrproper chown -R root.root ../alsa-utils mv ../alsa-utils ../alsa-utils-$(SND_UTIL_VERSION) - tar cvz -C .. -f ../alsa-utils-$(SND_UTIL_VERSION).tar.gz alsa-utils-$(SND_UTIL_VERSION) + tar --exclude=CVS -cvz -C .. -f ../alsa-utils-$(SND_UTIL_VERSION).tar.gz alsa-utils-$(SND_UTIL_VERSION) mv ../alsa-utils-$(SND_UTIL_VERSION) ../alsa-utils diff --git a/utils/alsa-utils.spec.in b/utils/alsa-utils.spec.in index 8802046..f740679 100644 --- a/utils/alsa-utils.spec.in +++ b/utils/alsa-utils.spec.in @@ -58,7 +58,7 @@ Features make %install -mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/man/man1 make prefix="$RPM_BUILD_ROOT/usr" install @@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc CHANGELOG COPYING README config.status +%doc ChangeLog COPYING README config.status %{prefix}/usr/sbin/* %{prefix}/usr/bin/* diff --git a/utils/buildrpm b/utils/buildrpm index 95606e1..408cdd3 100644 --- a/utils/buildrpm +++ b/utils/buildrpm @@ -4,13 +4,13 @@ source=. version=`cat $source/../version` package=$source/../../alsa-utils-$version.tar.gz +make -C .. pack + if [ ! -r $package ]; then echo "Error: wrong package: $package" exit 1 fi -make -C .. pack - cp -fv $package /usr/src/redhat/SOURCES if [ ! -r $source/buildrpm ]; then