Imported Upstream version 2.6.0p2

[debian/amanda] / packaging / rpm / buildpkg.rej

diff --git a/packaging/rpm/buildpkg.rej b/packaging/rpm/buildpkg.rej
deleted file mode 100644 (file)
index be33dd1..0000000
--- a/packaging/rpm/buildpkg.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-***************
-*** 6,12 ****
-  # Buildbot exports some useful env variables.
-  # Check for $AMVER.  I couldn't come up with a good way to detect it.
-  if [ -z $AMVER ]; then
--     AMVER=amanda-2.6.0
-  fi
-  # Check for AMTARBALL variable.
-  if [ -z $AMTARBALL ]; then 
---- 6,12 ----
-  # Buildbot exports some useful env variables.
-  # Check for $AMVER.  I couldn't come up with a good way to detect it.
-  if [ -z $AMVER ]; then
-+     AMVER=amanda-2.6.0p1
-  fi
-  # Check for AMTARBALL variable.
-  if [ -z $AMTARBALL ]; then