- requires_ge as nil

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 3c65191c243012bf5bafe931487e4c837a020c61..81797273c7def723ee81504d2fdc2da9a3bb3533 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -212,6 +212,15 @@ else
        RPMBUILD="rpmbuild"
 fi
 
+#
+# sanity checks
+#
+if [ -d $HOME/rpm/SOURCES ]; then
+       echo "ERROR: ~/rpm/{SPECS,SOURCES} structure is obsolete" >&2
+       echo "ERROR: get rid of your ~/rpm/SOURCES" >&2
+       exit 1
+fi
+
 #
 # are we using cvs-nserver ?
 #
@@ -449,6 +458,7 @@ minirpm() {
 %x8664 x86_64 amd64 ia32e
 %alt_kernel %{nil}
 %_alt_kernel %{nil}
+%bootstrap_release() %{1}
 %requires_releq_kernel_up(s:n:) %{nil}
 %requires_releq_kernel_smp(s:n:) %{nil}
 %requires_releq_kernel(s:n:) %{nil}
@@ -456,6 +466,7 @@ minirpm() {
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
 %requires_eq_to() %{nil}
+%requires_ge() %{nil}
 %releq_kernel_up(n:) ERROR
 %releq_kernel_smp(n:) ERROR
 %releq_kernel(n:) ERROR
@@ -491,6 +502,8 @@ minirpm() {
 %remove_etc_shells(p) %{p:<lua>}
 %lua_add_etc_shells()  %{nil}
 %lua_remove_etc_shells() %{nil}
+%required_jdk %{nil}
+%buildrequires_jdk %{nil}
 EOF
        if [ "$NOINIT" = "yes" ] ; then
                cat >> $BUILDER_MACROS <<'EOF'