diff --git a/.gitignore b/.gitignore index f5e7b28..6af2739 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ setup-2.8.25.tar.bz2 /setup-2.8.46.tar.bz2 /setup-2.8.47.tar.bz2 /setup-2.8.48.tar.bz2 +/setup-2.8.49.tar.bz2 diff --git a/setup.spec b/setup.spec index d900c2e..1092370 100644 --- a/setup.spec +++ b/setup.spec @@ -1,6 +1,6 @@ Summary: A set of system configuration and setup files Name: setup -Version: 2.8.48 +Version: 2.8.49 Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -11,6 +11,7 @@ BuildRequires: bash tcsh perl # RPM runtime check in the buildroot; this ensures we can not install the # incompatible setup.rpm on unconverted systems Requires: rpmlib(X-CheckUnifiedSystemdir) +Conflicts: filesystem < 3 Conflicts: initscripts < 4.26, bash <= 2.0.4-21 %description @@ -92,6 +93,9 @@ end %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab %changelog +* Tue Feb 21 2012 Ondrej Vasik 2.8.49-1 +- conflict with filesystems before usrmove change + * Sun Feb 12 2012 Ondrej Vasik 2.8.48-1 - remove /bin and /sbin from /etc/profile(#789616) - require usrmove diff --git a/sources b/sources index e32041e..8ef128f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c79941d322eb09000ffe8044eebc0441 setup-2.8.48.tar.bz2 +83114bb3672d7764ee22023562e0f7fc setup-2.8.49.tar.bz2