diff --git a/.cvsignore b/.cvsignore index 101d247..f9a66a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -LVM2.2.02.29.tgz +LVM2.2.02.30.tgz device-mapper.1.02.24.tgz diff --git a/LVM2.2.02.30.tgz.asc b/LVM2.2.02.30.tgz.asc new file mode 100644 index 0000000..10cea06 --- /dev/null +++ b/LVM2.2.02.30.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.1 (GNU/Linux) + +iD8DBQBHj5NnIoGRwVZ+LBcRAhc8AKDu8vWwfjXck8dvoDlyXWpNpoJavwCZAWl9 +A+VJKcZzeAi6SwcmPbuNoiY= +=iopy +-----END PGP SIGNATURE----- diff --git a/lvm2.spec b/lvm2.spec index 610ee1f..0b4227c 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -2,8 +2,8 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.29 -Release: 5%{?dist} +Version: 2.02.30 +Release: 6%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -13,8 +13,7 @@ Patch0: cluster-locking-built-in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel -BuildRequires: ncurses-static -BuildRequires: readline-devel, readline-static +BuildRequires: readline-devel BuildRequires: cman-devel BuildRequires: module-init-tools Requires: device-mapper >= %{device_mapper_version}-%{release} @@ -22,8 +21,6 @@ Requires: module-init-tools Conflicts: lvm Obsoletes: lvm -%define _exec_prefix /usr - %description LVM2 includes all of the support for handling read/write operations on physical volumes (hard disks, RAID-Systems, magneto optical, etc., @@ -40,21 +37,21 @@ or more physical volumes and creating one or more logical volumes %build cd device-mapper.%{device_mapper_version} %define _exec_prefix "" -%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig +%configure --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig +cd .. +%configure --enable-readline --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-dmdir=device-mapper.%{device_mapper_version} + +cd device-mapper.%{device_mapper_version} make cd .. -%define _exec_prefix /usr -%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-staticdir=/sbin --with-user= --with-group= --with-dmdir=device-mapper.%{device_mapper_version} make DESTDIR=$RPM_BUILD_ROOT +%define _exec_prefix / %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -make install_cluster DESTDIR=$RPM_BUILD_ROOT -ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm -ln -s lvm.static $RPM_BUILD_ROOT/sbin/pvscan -ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange -ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgscan +rm -f $RPM_BUILD_ROOT/sbin/clvmd +make install_cluster DESTDIR=$RPM_BUILD_ROOT sbindir=$RPM_BUILD_ROOT/usr/sbin install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/archive install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/backup install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/cache @@ -62,7 +59,7 @@ install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd -install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/usr/sbin/lvmconf +install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf cd device-mapper.%{device_mapper_version} make install DESTDIR=$RPM_BUILD_ROOT usrlibdir=$RPM_BUILD_ROOT/usr/%{_lib} exec_prefix= @@ -73,11 +70,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW -/sbin/lvm.static -/sbin/lvm -/sbin/pvscan -/sbin/vgscan -/sbin/vgchange +%{_sbindir}/fsadm %{_sbindir}/lvchange %{_sbindir}/lvconvert %{_sbindir}/lvcreate @@ -123,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/vgscan %{_sbindir}/vgsplit %{_mandir}/man5/lvm.conf.5.gz +%{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz %{_mandir}/man8/lvconvert.8.gz %{_mandir}/man8/lvcreate.8.gz @@ -192,17 +186,17 @@ Extensions to LVM2 to support clusters. %post cluster /sbin/chkconfig --add clvmd -/usr/sbin/lvmconf --lockinglibdir %{_libdir} +/sbin/lvmconf --lockinglibdir %{_libdir} %preun cluster if [ "$1" = 0 ]; then /sbin/chkconfig --del clvmd - /usr/sbin/lvmconf --disable-cluster + /sbin/lvmconf --disable-cluster fi %files cluster %defattr(-,root,root,-) -%attr(755,root,root) %{_sbindir}/clvmd +%attr(755,root,root) /usr/sbin/clvmd %{_sbindir}/lvmconf %{_mandir}/man8/clvmd.8.gz /etc/rc.d/init.d/clvmd @@ -232,7 +226,6 @@ for the kernel device-mapper. %doc device-mapper.%{device_mapper_version}/VERSION %doc device-mapper.%{device_mapper_version}/WHATS_NEW %attr(755,root,root) /sbin/dmsetup -%attr(755,root,root) /sbin/dmsetup.static %{_mandir}/man8/dmsetup.8.gz %package -n device-mapper-devel @@ -250,10 +243,9 @@ the device-mapper libraries. %files -n device-mapper-devel %defattr(-,root,root,-) -%attr(755,root,root) /%{_lib}/libdevmapper.a* %attr(755,root,root) /%{_lib}/libdevmapper.so %{_includedir}/libdevmapper.h -%{_libdir}/pkgconfig/*.pc +/usr%{_libdir}/pkgconfig/*.pc %package -n device-mapper-libs Summary: Device-mapper shared library @@ -275,6 +267,27 @@ This package contains the device-mapper shared library, libdevmapper. %changelog +* Thu Jan 17 2008 Alasdair Kergon > - 2.02.30-6 +- Remove static libraries and binaries and move most binaries out of /usr. +- Fix a segfault if using pvs with --all argument. +- Fix vgreduce PV list processing not to process every PV in the VG. +- Reinstate VG extent size and stripe size defaults (halved). +- Set default readahead to twice maximium stripe size. +- Detect non-orphans without MDAs correctly. +- Prevent pvcreate from overwriting MDA-less PVs belonging to active VGs. +- Don't use block_on_error with mirror targets version 1.12 and above. +- Change vgsplit -l (for unimplemented --list) into --maxlogicalvolumes. +- Update vgsplit to accept vgcreate options when new VG is destination. +- Update vgsplit to accept existing VG as destination. +- Major restructuring of pvmove and lvconvert code, adding stacking support. +- Add new convert_lv field to lvs output. +- Permit LV segment fields with PV segment reports. +- Extend lvconvert to use polldaemon and wait for completion of initial sync. +- Add seg_start_pe and seg_pe_ranges to reports. +- Add fsadm interface to filesystem resizing tools. +- Update --uuid argument description in man pages. +- Print warning when lvm tools are running as non-root. + * Thu Dec 20 2007 Alasdair Kergon > - 2.02.29-5 - Fix libdevmapper readahead processing with snapshots (for example). diff --git a/sources b/sources index cc475a9..3b5cb0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -61d7f49ef4908818278713564039a1ed LVM2.2.02.29.tgz +58d10383fa57a95e6c4c31b2d6534c25 LVM2.2.02.30.tgz 44420c94a412323da9d8b1ce21f2bebd device-mapper.1.02.24.tgz diff --git a/upstream b/upstream index 101d247..f9a66a1 100644 --- a/upstream +++ b/upstream @@ -1,2 +1,2 @@ -LVM2.2.02.29.tgz +LVM2.2.02.30.tgz device-mapper.1.02.24.tgz