Changeset 664 in ProjectBuilder for projects/schroot/pbconf

Timestamp:

Feb 5, 2009, 3:44:15 PM (16 years ago)

Author:

Bruno Cornec

Message:

boostlib-patch useless and fixes for correct patches for schroot

Location:

projects/schroot/pbconf/devel/schroot

Files:

• pbpatch/02-schroot-boostlib-patch.rpm (deleted)
• pbpatch/03-schroot-setup-patch.rpm (modified) (1 diff)
• rpm/schroot.spec (modified) (1 diff)

projects/schroot/pbconf/devel/schroot/pbpatch/03-schroot-setup-patch.rpm

@@ -18 +18 @@
         --pid=$PID || true
  
-    if [ "$AUTH_VERBOSITY" = "verbose" ]; then
--       lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
-+       /usr/sbin/lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
-    else
--       lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
-+       /usr/sbin/lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
-    fi
+        if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+-       lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
++           /usr/sbin/lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
+        else
+-       lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
++           /usr/sbin/lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
+        fi
  
      fi

projects/schroot/pbconf/devel/schroot/rpm/schroot.spec

@@ -17 +17 @@
 PBPATCHSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:       PBDEP
+Requires:       PBDEP e2fsprogs pam
 BuildRequires:  PBBUILDDEP e2fsprogs-devel e2fsprogs pam-devel gcc-c++