update to 2.02.62

- add libs,devel subpackage
  - liblvm2{app,cmd},libdevmapper-event-lvm2
- enable dmeventd
  - add device-mapper-event{,-libs,-devel}
- enable udev sync code
  - add BR: libudev-devel, R: libudev
- disable static libs and binaries
      


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@757 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lvm2/lvm2-vl.spec

@@ -1,6 +1,5 @@
-%define brp-strip-shared /bin/true
-%define lvm_version 2.02.60
-%define device_mapper_version 1.02.43
+%define lvm_version 2.02.62
+%define device_mapper_version 1.02.45
 %define with_cluster 0
 
 Summary: Userland logical volume management tools
@@ -16,7 +15,10 @@ BuildRoot: %{_tmppath}/%{name}-%{lvm_version}-%{release}-buildroot
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
+BuildRequires: libudev-devel
 Requires: device-mapper >= %{device_mapper_version}-%{release}
+Requires: device-mapper-event >= %{device_mapper_version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Conflicts: lvm
 Obsoletes: lvm
 
@@ -30,6 +32,28 @@ losetup(8)), creating volume groups (kind of virtual disks) from one
 or more physical volumes and creating one or more logical volumes
 (kind of logical partitions) in volume groups.
 
+%package devel
+Summary: Development libraries and headers
+Group: Development/Libraries
+License: LGPLv2
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: device-mapper-devel >= %{device_mapper_version}-%{release}
+Requires: device-mapper-event-devel >= %{device_mapper_version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package contains files needed to develop applications that use
+the lvm2 libraries.
+
+%package libs
+Summary: lvm2 shared libraries
+License: LGPLv2
+Group: System Environment/Libraries
+
+%description libs
+This package contains shared lvm2 libraries for applications.
+
 %if %{with_cluster}
 # lvm2-cluster
 %package cluster
@@ -55,6 +79,8 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Requires: device-mapper-libs = %{device_mapper_version}-%{release}
+Requires: libudev
+Requires: util-linux-ng >= 2.15
 
 %description -n device-mapper
 This package contains the supporting userspace utility, dmsetup,
@@ -85,6 +111,41 @@ Obsoletes: device-mapper < 1.02.30-1
 %description -n device-mapper-libs
 This package contains the device-mapper shared library, libdevmapper.
 
+%package -n device-mapper-event
+Summary: Device-mapper event daemon
+Group: System Environment/Base
+Version: %{device_mapper_version}
+Release: %{release}
+Requires: device-mapper = %{device_mapper_version}-%{release}
+Requires: device-mapper-event-libs = %{device_mapper_version}-%{release}
+
+%description -n device-mapper-event
+This package contains the dmeventd daemon for monitoring the state
+of device-mapper devices.
+
+%package -n device-mapper-event-libs
+Summary: Device-mapper event daemon shared library
+Version: %{device_mapper_version}
+Release: %{release}
+License: LGPLv2
+Group: System Environment/Libraries
+
+%description -n device-mapper-event-libs
+This package contains the device-mapper event daemon shared library,
+libdevmapper-event.
+
+%package -n device-mapper-event-devel
+Summary: Development libraries and headers for the device-mapper event daemon
+Version: %{device_mapper_version}
+Release: %{release}
+License: LGPLv2
+Group: Development/Libraries
+Requires: device-mapper-event = %{device_mapper_version}-%{release}
+Requires: pkgconfig
+
+%description -n device-mapper-event-devel
+This package contains files needed to develop applications that use
+the device-mapper event library.
 
 %prep
 %setup -q -n LVM2.%{lvm_version}
@@ -94,16 +155,29 @@ This package contains the device-mapper shared library, libdevmapper.
 %define _bindir /bin
 %define _sbindir /sbin
 %define _libdir /%{_lib}
-
-%configure --enable-static_link --enable-readline --enable-lvm1_fallback \
-           --with-pool=internal --with-staticdir=/sbin \
-	   --with-user= --with-group= \
-	   --with-dmdir=device-mapper.%{device_mapper_version} \
-	   --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin \
-	   --with-device-uid=0 --with-device-gid=6 \
-	   --with-device-mode=0660 --enable-pkgconfig
-
-make DESTDIR=$RPM_BUILD_ROOT
+%define _udevbasedir /lib/udev
+%define _udevdir %{_udevbasedir}/rules.d
+
+%configure \
+  --enable-readline \
+  --enable-lvm1_fallback \
+  --enable-fsadm \
+  --with-pool=internal \
+  --with-staticdir=/sbin \
+  --with-user= --with-group= \
+  --with-usrlibdir=/usr/%{_lib} \
+  --with-usrsbindir=/usr/sbin \
+  --with-dmdir=device-mapper.%{device_mapper_version} \
+  --with-udevdir=%{_udevdir} \
+  --with-device-uid=0 --with-device-gid=6 \
+  --with-device-mode=0660 \
+  --enable-pkgconfig \
+  --enable-applib \
+  --enable-cmdlib \
+  --enable-dmeventd \
+  --enable-udev_sync
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -116,20 +190,27 @@ install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 %if %{with_cluster}
 install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
-install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
+install scripts/cmirrord_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/cmirrord
 %endif
-
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mv $RPM_BUILD_ROOT/%{_lib}/libdevmapper.a* $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/
-
-# temporarily changes file permissions so that brp-strip* succeeds
-find $RPM_BUILD_ROOT/sbin -type f -exec chmod 0755 {} \;
-chmod 0755 $RPM_BUILD_ROOT/%{_lib}/*.so.*
-chmod 0755 $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/*.a.*
+install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor
+install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add lvm2-monitor
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del lvm2-monitor
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %if %{with_cluster}
 %post cluster
 /sbin/chkconfig --add clvmd
@@ -147,20 +228,24 @@ fi
 
 %postun -n device-mapper-libs -p /sbin/ldconfig
 
+%post -n device-mapper-event-libs -p /sbin/ldconfig
+
+%postun -n device-mapper-event-libs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
 %attr(555,root,root) %{_sbindir}/fsadm
+%{_sbindir}/fsadm
 %{_sbindir}/lvchange
 %{_sbindir}/lvconvert
 %{_sbindir}/lvcreate
 %{_sbindir}/lvdisplay
 %{_sbindir}/lvextend
-%attr(555,root,root) %{_sbindir}/lvm
-%attr(555,root,root) %{_sbindir}/lvm.static
+%{_sbindir}/lvm
 %{_sbindir}/lvmchange
 %{_sbindir}/lvmdiskscan
-%attr(555,root,root) %{_sbindir}/lvmdump
+%{_sbindir}/lvmdump
 %{_sbindir}/lvmsadc
 %{_sbindir}/lvmsar
 %{_sbindir}/lvreduce
@@ -188,7 +273,7 @@ fi
 %{_sbindir}/vgexport
 %{_sbindir}/vgextend
 %{_sbindir}/vgimport
-%attr(555,root,root) %{_sbindir}/vgimportclone
+%{_sbindir}/vgimportclone
 %{_sbindir}/vgmerge
 %{_sbindir}/vgmknodes
 %{_sbindir}/vgreduce
@@ -197,6 +282,7 @@ fi
 %{_sbindir}/vgs
 %{_sbindir}/vgscan
 %{_sbindir}/vgsplit
+%{_sbindir}/lvmconf
 %{_mandir}/man5/lvm.conf.5.gz
 %{_mandir}/man8/fsadm.8.gz
 %{_mandir}/man8/lvchange.8.gz
@@ -249,35 +335,76 @@ fi
 %dir /etc/lvm/cache
 %dir /etc/lvm/archive
 %dir /var/lock/lvm
+/etc/rc.d/init.d/lvm2-monitor
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblvm2app.so
+%{_libdir}/liblvm2cmd.so
+%{_includedir}/lvm2app.h
+%{_includedir}/lvm2cmd.h
+/usr%{_libdir}/pkgconfig/lvm2app.pc
+
+%files libs
+%attr(755,root,root) %{_libdir}/liblvm2app.so.*
+%attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
+%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.*
+%{_libdir}/libdevmapper-event-lvm2.so
+%{_libdir}/libdevmapper-event-lvm2mirror.so
+%{_libdir}/libdevmapper-event-lvm2snapshot.so
 
 %if %{with_cluster}
 %files cluster
 %defattr(-,root,root,-)
 %attr(755,root,root) /usr/sbin/clvmd
-%{_sbindir}/lvmconf
 %{_mandir}/man8/clvmd.8.gz
 /etc/rc.d/init.d/clvmd
 %endif
 
 %files -n device-mapper
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL
+%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules
 %attr(755,root,root) /sbin/dmsetup
-%attr(755,root,root) /sbin/dmsetup.static
 %{_mandir}/man8/dmsetup.8.gz
+%dir %{_udevbasedir}
+%dir %{_udevdir}
+%{_udevdir}/10-dm.rules
+%{_udevdir}/13-dm-disk.rules
+%{_udevdir}/95-dm-notify.rules
 
 %files -n device-mapper-devel
 %defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libdevmapper.so
-%{_prefix}/%{_lib}/libdevmapper.a*
 %{_includedir}/libdevmapper.h
-/usr%{_libdir}/pkgconfig/*.pc
+/usr%{_libdir}/pkgconfig/devmapper.pc
 
 %files -n device-mapper-libs
 %attr(755,root,root) /%{_lib}/libdevmapper.so.*
 
+%files -n device-mapper-event
+%defattr(-,root,root,-)
+%{_sbindir}/dmeventd
+
+%files -n device-mapper-event-libs
+%{_libdir}/libdevmapper-event.so.*
+
+%files -n device-mapper-event-devel
+%defattr(-,root,root,-)
+%attr(755,root,root) /%{_lib}/libdevmapper-event.so
+%{_includedir}/libdevmapper-event.h
+/usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Mon Mar 29 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.02.62-1
+- new upstream release
+- add libs,devel subpackage
+  - liblvm2{app,cmd},libdevmapper-event-lvm2
+- enable dmeventd
+  - add device-mapper-event{,-libs,-devel}
+- enable udev sync code
+  - add BR: libudev-devel, R: libudev
+- disable static libs and binaries
+
 * Sun Feb 14 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.02.60-1
 - new upstream release