From 195a6a51b34c73ccdf0c87e686385a671f5952c2 Mon Sep 17 00:00:00 2001
From: cdfrey <cdfrey>
Date: Sat, 1 Dec 2007 02:25:16 +0000
Subject: [PATCH] - fixed bug in rpm maintenance script that used the wrong    
    spec file for opensuse

---
 ChangeLog              | 2 ++
 maintainer/make-rpm.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4efda277..977fb810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Release: version 0.10 - 2007/11/30
 		behaviour and the new blacklist files... less
 		concern about berry_charge and usb_storage conflicts
 	- added bidentify tool and accompanying man page
+	- fixed bug in rpm maintenance script that used the wrong
+		spec file for opensuse
 2007/11/29
 	- added better error checking to breset
 	- commented the sleep() for the 8830
diff --git a/maintainer/make-rpm.sh b/maintainer/make-rpm.sh
index e962461e..017b0f46 100755
--- a/maintainer/make-rpm.sh
+++ b/maintainer/make-rpm.sh
@@ -29,7 +29,7 @@ TAG="$4"
 set -e
 
 cp "$TARPATH" "$CHROOT/$TARGET/usr/src/redhat/SOURCES"
-cp "$SPECPATH" "$CHROOT/$TARGET/usr/src/redhat/SPECS"
+cp "$SPECPATH" "$CHROOT/$TARGET/usr/src/redhat/SPECS/barry.spec"
 chroot "$CHROOT/$TARGET" /bin/sh -lc "rm -f /usr/src/redhat/RPMS/i386/* /usr/src/redhat/SRPMS/* && cd /usr/src/redhat/SPECS && rpmbuild --target i386 -ba barry.spec --with gui --with opensync && cd /usr/src/redhat/RPMS/i386"
 mkdir -p "build/$TARGET"
 cp "$CHROOT/$TARGET/usr/src/redhat/RPMS/i386/"* "build/$TARGET"
-- 
2.11.4.GIT