rpms/lvm2/devel device-mapper.1.02.23.tgz.asc, NONE, 1.1 .cvsignore, 1.53, 1.54 lvm2.spec, 1.119, 1.120 mirrors, 1.1, 1.2 sources, 1.56, 1.57 upstream, 1.46, 1.47
Alasdair Kergon (agk)
fedora-extras-commits at redhat.com
Thu Dec 6 19:59:07 UTC 2007
Author: agk
Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21688
Modified Files:
.cvsignore lvm2.spec mirrors sources upstream
Added Files:
device-mapper.1.02.23.tgz.asc
Log Message:
merge dm build into lvm2 one
--- NEW FILE device-mapper.1.02.23.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQBHVtvxIoGRwVZ+LBcRAj7TAJ93538yOQyRbatjcrrTqbTU9e75yACguAUh
q2VC7jjlaHRG1ylCkU6J7D8=
=iWQA
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 5 Dec 2007 22:55:05 -0000 1.53
+++ .cvsignore 6 Dec 2007 19:58:32 -0000 1.54
@@ -1 +1,2 @@
LVM2.2.02.29.tgz
+device-mapper.1.02.23.tgz
Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- lvm2.spec 5 Dec 2007 22:55:05 -0000 1.119
+++ lvm2.spec 6 Dec 2007 19:58:32 -0000 1.120
@@ -1,22 +1,23 @@
-%define device_mapper_version 1.02.23-1
+%define device_mapper_version 1.02.23
+%define rel 2
Summary: Userland logical volume management tools
Name: lvm2
Version: 2.02.29
-Release: 1%{?dist}
+Release: %{rel}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://sources.redhat.com/lvm2
Source0: LVM2.%{version}.tgz
+Source1: device-mapper.%{device_mapper_version}.tgz
Patch0: cluster-locking-built-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: device-mapper-devel >= %{device_mapper_version}
BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
BuildRequires: ncurses-devel
BuildRequires: ncurses-static
BuildRequires: readline-devel, readline-static
BuildRequires: cman-devel
-Requires: device-mapper >= %{device_mapper_version}
+Requires: device-mapper >= %{device_mapper_version}-%{rel}
Conflicts: lvm
Obsoletes: lvm
@@ -32,10 +33,17 @@
%prep
%setup -q -n LVM2.%{version}
+%setup -q -T -D -a 1 -n LVM2.%{version}
%patch -p1 -b .locking
%build
-%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=
+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
+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
%install
@@ -55,6 +63,14 @@
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
+cd device-mapper.%{device_mapper_version}
+make install DESTDIR=$RPM_BUILD_ROOT usrlibdir=$RPM_BUILD_ROOT/usr/%{_lib} exec_prefix=
+cp INSTALL ../INSTALL_DM
+cp INTRO ..
+cp README ../README_DM
+cp VERSION ../VERSION_DM
+cp WHATS_NEW ../WHATS_NEW_DM
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -168,7 +184,7 @@
Summary: Cluster extensions for userland logical volume management tools
License: GPLv2
Group: System Environment/Base
-Requires: lvm2 >= %{version}-%{release}
+Requires: lvm2 >= %{version}-%{rel}
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): device-mapper >= %{device_mapper_version}
@@ -195,8 +211,76 @@
%{_mandir}/man8/clvmd.8.gz
/etc/rc.d/init.d/clvmd
+##############################################################################
+# Device-mapper subpackages
+##############################################################################
+%package -n device-mapper
+Summary: Device mapper utility
+Version: %{device_mapper_version}
+Release: %{rel}%{?dist}
+License: GPLv2
+Group: System Environment/Base
+URL: http://sources.redhat.com/dm
+Requires: device-mapper-libs = %{device_mapper_version}-%{rel}
+
+%description -n device-mapper
+This package contains the supporting userspace utility, dmsetup,
+for the kernel device-mapper.
+
+%files -n device-mapper
+%defattr(-,root,root,-)
+%doc COPYING COPYING.LIB INTRO
+%doc device-mapper.%{device_mapper_version}/INSTALL
+%doc device-mapper.%{device_mapper_version}/README
+%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
+Summary: Development libraries and headers for device-mapper
+Version: %{device_mapper_version}
+Release: %{rel}%{?dist}
+License: LGPLv2.1
+Group: Development/Libraries
+Requires: device-mapper = %{device_mapper_version}-%{rel}
+Requires: device-mapper-libs = %{device_mapper_version}-%{rel}
+
+%description -n device-mapper-devel
+This package contains files needed to develop applications that use
+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
+
+%package -n device-mapper-libs
+Summary: Device-mapper shared library
+Version: %{device_mapper_version}
+Release: %{rel}%{?dist}
+License: LGPLv2.1
+Group: System Environment/Libraries
+Obsoletes: device-mapper < 1.02.17-6
+
+%description -n device-mapper-libs
+This package contains the device-mapper shared library, libdevmapper.
+
+%post -n device-mapper-libs -p /sbin/ldconfig
+
+%postun -n device-mapper-libs -p /sbin/ldconfig
+
+%files -n device-mapper-libs
+%attr(755,root,root) /%{_lib}/libdevmapper.so.*
+
%changelog
+* Thu Dec 06 2007 Alasdair Kergon <agk at redhat.com> - 2.02.29-2
+- Fold device-mapper build into this lvm2 spec file.
+
* Wed Dec 05 2007 Alasdair Kergon <agk at redhat.com> - 2.02.29-1
- Make clvmd backup vg metadata on remote nodes.
- Decode cluster locking state in log message.
Index: mirrors
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/mirrors,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrors 15 Sep 2004 17:27:45 -0000 1.1
+++ mirrors 6 Dec 2007 19:58:32 -0000 1.2
@@ -1 +1,2 @@
ftp://sources.redhat.com/pub/lvm2/
+ftp://sources.redhat.com/pub/dm/
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 5 Dec 2007 22:55:05 -0000 1.56
+++ sources 6 Dec 2007 19:58:32 -0000 1.57
@@ -1 +1,2 @@
61d7f49ef4908818278713564039a1ed LVM2.2.02.29.tgz
+d2d5d8b5383d80652d4066092d6f85e8 device-mapper.1.02.23.tgz
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- upstream 5 Dec 2007 22:55:05 -0000 1.46
+++ upstream 6 Dec 2007 19:58:32 -0000 1.47
@@ -1 +1,2 @@
LVM2.2.02.29.tgz
+device-mapper.1.02.23.tgz
More information about the fedora-extras-commits
mailing list