View | Details | Raw Unified | Return to bug 33339
Collapse All | Expand All

(-)a/alt/lvm2.spec (-13 / +48 lines)
Lines 14-19 Link Here
14
%def_disable lvmlockd
14
%def_disable lvmlockd
15
%def_enable blkid_wiping
15
%def_enable blkid_wiping
16
%def_disable lvmdbusd
16
%def_disable lvmdbusd
17
%def_enable systemd
18
%def_enable thin
17
19
18
%if_enabled lvmlockd
20
%if_enabled lvmlockd
19
 %def_enable lockd_sanlock
21
 %def_enable lockd_sanlock
Lines 25-31 Link Here
25
Summary: Userland logical volume management tools
27
Summary: Userland logical volume management tools
26
Name: lvm2
28
Name: lvm2
27
Version: %lvm2version
29
Version: %lvm2version
28
Release: alt1
30
Release: alt1.1
29
License: GPL
31
License: GPL
30
32
31
Group: System/Base
33
Group: System/Base
Lines 46-61 Requires: dmsetup >= %{dmversion}-%{release} Link Here
46
Requires: dmeventd >= %{dmversion}-%{release}
48
Requires: dmeventd >= %{dmversion}-%{release}
47
Requires: liblvm2  = %{lvm2version}-%{release}
49
Requires: liblvm2  = %{lvm2version}-%{release}
48
50
49
50
BuildRequires: gcc-c++
51
BuildRequires: gcc-c++
51
BuildRequires: libreadline-devel libtinfo-devel libudev-devel CUnit-devel
52
BuildRequires: libreadline-devel libtinfo-devel libudev-devel CUnit-devel
53
%if_enabled systemd
54
# libudev-devel >= 205 required for udev-systemd-background-jobs
52
BuildRequires: libudev-devel >= 205
55
BuildRequires: libudev-devel >= 205
53
BuildRequires: systemd-devel
56
BuildRequires: systemd-devel
54
BuildRequires: thin-provisioning-tools >= 0.5.4
57
%else
58
BuildRequires: libudev-devel
59
%endif
55
BuildRequires: python-devel python-module-setuptools
60
BuildRequires: python-devel python-module-setuptools
56
BuildRequires(pre): rpm-build-python3
61
BuildRequires(pre): rpm-build-python3
57
BuildRequires: python3-devel python3-module-setuptools
62
BuildRequires: python3-devel python3-module-setuptools
58
BuildRequires: autoconf-archive
63
BuildRequires: autoconf-archive
64
%{?_enable_cluster:BuildRequires: thin-provisioning-tools >= 0.5.4}
59
%{?_enable_lvmdbusd:BuildRequires: python-module-dbus python-module-pyudev python3-module-dbus python3-module-pyudev}
65
%{?_enable_lvmdbusd:BuildRequires: python-module-dbus python-module-pyudev python3-module-dbus python3-module-pyudev}
60
%{?_enable_static:BuildRequires: libreadline-devel-static libtinfo-devel-static}
66
%{?_enable_static:BuildRequires: libreadline-devel-static libtinfo-devel-static}
61
%{?_enable_cluster:BuildRequires: libcorosync2-devel libdlm-devel}
67
%{?_enable_cluster:BuildRequires: libcorosync2-devel libdlm-devel}
Lines 231-238 logical volumes, physical volumes, and volume groups. Link Here
231
237
232
%prep
238
%prep
233
%setup
239
%setup
234
235
%patch -p1
240
%patch -p1
241
%ifarch e2k
242
sed -i 's,-Wmissing-include-dirs,,' make.tmpl*
243
%endif
236
244
237
%build
245
%build
238
%autoreconf
246
%autoreconf
Lines 262-273 export ac_cv_path_MODPROBE_CMD=%_sbindir/modprobe Link Here
262
	--with-default-locking-dir=%_lockdir/lvm
270
	--with-default-locking-dir=%_lockdir/lvm
263
271
264
	#
272
	#
265
%__make libdm
273
%make libdm
266
%__make lib
274
%make lib
267
%__make -C tools lvm.static
275
%make -C tools lvm.static
268
mv tools/lvm.static .
276
mv tools/lvm.static .
269
mv libdm/ioctl/libdevmapper.a .
277
mv libdm/ioctl/libdevmapper.a .
270
%__make clean
278
%make clean
271
%endif # static
279
%endif # static
272
280
273
# dynamic
281
# dynamic
Lines 304-310 mv libdm/ioctl/libdevmapper.a . Link Here
304
	%{?_enable_lockd_sanlock:--enable-lockd-sanlock} \
312
	%{?_enable_lockd_sanlock:--enable-lockd-sanlock} \
305
	%{?_enable_lvmdbusd:--enable-dbus-service} \
313
	%{?_enable_lvmdbusd:--enable-dbus-service} \
306
	--with-dmeventd-path="%_sbindir/dmeventd" \
314
	--with-dmeventd-path="%_sbindir/dmeventd" \
307
	--with-systemdsystemunitdir=%_unitdir \
315
	%{?_enable_systemd:--with-systemdsystemunitdir=%_unitdir} \
308
	--with-tmpfilesdir=%_tmpfilesdir \
316
	--with-tmpfilesdir=%_tmpfilesdir \
309
	--with-default-pid-dir=%_runtimedir \
317
	--with-default-pid-dir=%_runtimedir \
310
	--with-default-dm-run-dir=%_runtimedir \
318
	--with-default-dm-run-dir=%_runtimedir \
Lines 320-340 mv libdm/ioctl/libdevmapper.a . Link Here
320
	--with-cache-dump=/usr/sbin/cache_dump \
328
	--with-cache-dump=/usr/sbin/cache_dump \
321
	--with-cache-repair=/usr/sbin/cache_repair \
329
	--with-cache-repair=/usr/sbin/cache_repair \
322
	--with-cache-restore=/usr/sbin/cache_restore \
330
	--with-cache-restore=/usr/sbin/cache_restore \
331
%if_enabled thin
323
	--with-thin=internal \
332
	--with-thin=internal \
324
	--with-thin-check=/usr/sbin/thin_check \
333
	--with-thin-check=/usr/sbin/thin_check \
325
	--with-thin-dump=/usr/sbin/thin_dump \
334
	--with-thin-dump=/usr/sbin/thin_dump \
326
	--with-thin-repair=/usr/sbin/thin_repair \
335
	--with-thin-repair=/usr/sbin/thin_repair \
327
	--with-thin-restore=/usr/sbin/thin_restore \
336
	--with-thin-restore=/usr/sbin/thin_restore \
337
%endif
328
	--enable-python2-bindings \
338
	--enable-python2-bindings \
329
	--enable-python3-bindings
339
	--enable-python3-bindings
330
340
331
%__make
341
%make
332
342
333
%install
343
%install
334
%makeinstall_std
344
%makeinstall_std
335
%makeinstall_std install_system_dirs
345
%makeinstall_std install_system_dirs
346
%if_enabled systemd
336
%makeinstall_std install_systemd_units
347
%makeinstall_std install_systemd_units
337
%makeinstall_std install_systemd_generators
348
%makeinstall_std install_systemd_generators
349
%endif
338
%makeinstall_std install_tmpfiles_configuration
350
%makeinstall_std install_tmpfiles_configuration
339
351
340
chmod -R u+rwX %buildroot
352
chmod -R u+rwX %buildroot
Lines 366-372 ln -sf ../../%_lib/liblvm2app.so.2.2 ./liblvm2app.so Link Here
366
popd
378
popd
367
379
368
# Fix pkgconfig file.
380
# Fix pkgconfig file.
369
%__subst '/^Version:/ s/"\([^[:space:]]\+\)[^"]*"/\1/' %buildroot%_pkgconfigdir/*
381
subst '/^Version:/ s/"\([^[:space:]]\+\)[^"]*"/\1/' %buildroot%_pkgconfigdir/*
370
382
371
# provide a symlink for devmapper.pc
383
# provide a symlink for devmapper.pc
372
ln -sf devmapper.pc %buildroot%_pkgconfigdir/libdevmapper.pc
384
ln -sf devmapper.pc %buildroot%_pkgconfigdir/libdevmapper.pc
Lines 381-387 install -m 0755 %SOURCE4 %buildroot%_initdir/lvm2-lvmetad Link Here
381
install -m 0755 %SOURCE5 %buildroot%_initdir/blk-availability
393
install -m 0755 %SOURCE5 %buildroot%_initdir/blk-availability
382
install -m 0755 %SOURCE6 %buildroot%_initdir/lvm2-lvmpolld
394
install -m 0755 %SOURCE6 %buildroot%_initdir/lvm2-lvmpolld
383
395
396
%if_enabled cluster
384
mv %buildroot%_prefix/sbin/clvmd %buildroot%_sbindir/
397
mv %buildroot%_prefix/sbin/clvmd %buildroot%_sbindir/
398
%endif
385
mkdir -p %buildroot%_sysconfdir/sysconfig
399
mkdir -p %buildroot%_sysconfdir/sysconfig
386
cat << __EOF__ > %buildroot%_sysconfdir/sysconfig/clvmd
400
cat << __EOF__ > %buildroot%_sysconfdir/sysconfig/clvmd
387
START_CLVM=yes
401
START_CLVM=yes
Lines 442-461 __EOF__ Link Here
442
%config(noreplace) %_sysconfdir/lvm/lvmlocal.conf
456
%config(noreplace) %_sysconfdir/lvm/lvmlocal.conf
443
%config(noreplace) %verify(not md5 mtime size) %_sysconfdir/lvm/profile/*.profile
457
%config(noreplace) %verify(not md5 mtime size) %_sysconfdir/lvm/profile/*.profile
444
%_initdir/lvm2-monitor
458
%_initdir/lvm2-monitor
459
%if_enabled systemd
445
%_unitdir/lvm2-monitor.service
460
%_unitdir/lvm2-monitor.service
446
%_initdir/blk-availability
447
%_unitdir/blk-availability.service
461
%_unitdir/blk-availability.service
462
%endif
463
%_initdir/blk-availability
448
%if_enabled lvmetad
464
%if_enabled lvmetad
449
%_initdir/lvm2-lvmetad
465
%_initdir/lvm2-lvmetad
466
%if_enabled systemd
450
%_unitdir/lvm2-lvmetad*
467
%_unitdir/lvm2-lvmetad*
451
%_unitdir/lvm2-pvscan@.service
468
%_unitdir/lvm2-pvscan@.service
469
%endif
452
%_udevrulesdir/69-dm-lvm-metad.rules
470
%_udevrulesdir/69-dm-lvm-metad.rules
453
%endif
471
%endif
454
%if_enabled lvmpolld
472
%if_enabled lvmpolld
455
%_initdir/lvm2-lvmpolld
473
%_initdir/lvm2-lvmpolld
474
%if_enabled systemd
456
%_unitdir/lvm2-lvmpolld*
475
%_unitdir/lvm2-lvmpolld*
457
%endif
476
%endif
477
%endif
478
%if_enabled systemd
458
/lib/systemd/system-generators/lvm2-activation-generator
479
/lib/systemd/system-generators/lvm2-activation-generator
480
%endif
459
%_tmpfilesdir/%name.conf
481
%_tmpfilesdir/%name.conf
460
%dir %_sysconfdir/lvm
482
%dir %_sysconfdir/lvm
461
%dir %_sysconfdir/lvm/profile
483
%dir %_sysconfdir/lvm/profile
Lines 474-481 __EOF__ Link Here
474
%if_enabled cluster
496
%if_enabled cluster
475
%files -n clvm
497
%files -n clvm
476
%config(noreplace) %_sysconfdir/sysconfig/clvmd
498
%config(noreplace) %_sysconfdir/sysconfig/clvmd
499
%if_enabled systemd
477
%_unitdir/lvm2-c*.service
500
%_unitdir/lvm2-c*.service
478
/lib/systemd/lvm2-cluster-activation
501
/lib/systemd/lvm2-cluster-activation
502
%endif
479
%_sbindir/clvmd
503
%_sbindir/clvmd
480
%_man8dir/clvmd*
504
%_man8dir/clvmd*
481
%endif
505
%endif
Lines 519-526 __EOF__ Link Here
519
543
520
%files -n dmeventd
544
%files -n dmeventd
521
%_sbindir/dmeventd
545
%_sbindir/dmeventd
546
%if_enabled systemd
522
%_unitdir/dm-event.service
547
%_unitdir/dm-event.service
523
%_unitdir/dm-event.socket
548
%_unitdir/dm-event.socket
549
%endif
524
550
525
%files -n libdevmapper-event
551
%files -n libdevmapper-event
526
/%_lib/libdevmapper-event.so.*
552
/%_lib/libdevmapper-event.so.*
Lines 538-544 __EOF__ Link Here
538
%_sbindir/lvmlockd
564
%_sbindir/lvmlockd
539
%_sbindir/lvmlockctl
565
%_sbindir/lvmlockctl
540
%_man8dir/lvmlockd*
566
%_man8dir/lvmlockd*
567
%if_enabled systemd
541
%_unitdir/lvm2-lvmlock*
568
%_unitdir/lvm2-lvmlock*
569
%endif
542
%_initdir/lvm2-lvmlock*
570
%_initdir/lvm2-lvmlock*
543
%endif
571
%endif
544
572
Lines 547-553 __EOF__ Link Here
547
%_sysconfdir/dbus-1/system.d/com.redhat.lvmdbus1.conf
575
%_sysconfdir/dbus-1/system.d/com.redhat.lvmdbus1.conf
548
%_datadir/dbus-1/system-services/com.redhat.lvmdbus1.service
576
%_datadir/dbus-1/system-services/com.redhat.lvmdbus1.service
549
%_man8dir/lvmdbusd.*
577
%_man8dir/lvmdbusd.*
578
%if_enabled systemd
550
%_unitdir/lvm2-lvmdbusd.service
579
%_unitdir/lvm2-lvmdbusd.service
580
%endif
551
%python3_sitelibdir/lvmdbusd/*
581
%python3_sitelibdir/lvmdbusd/*
552
%endif
582
%endif
553
583
Lines 558-563 __EOF__ Link Here
558
%python3_sitelibdir/*
588
%python3_sitelibdir/*
559
589
560
%changelog
590
%changelog
591
* Mon Apr 03 2017 Michael Shigorin <mike@altlinux.org> 2.02.168-alt1.1
592
- BOOTSTRAP: introduce systemd, thin knobs (on by default)
593
- E2K: avoid lcc-unsupported option
594
- loosen BR: libudev-devel as 205+ isn't a strict requirement
595
- internal macros cleaned up
596
561
* Wed Dec 07 2016 Alexey Shabalin <shaba@altlinux.ru> 2.02.168-alt1
597
* Wed Dec 07 2016 Alexey Shabalin <shaba@altlinux.ru> 2.02.168-alt1
562
- 2.02.168
598
- 2.02.168
563
599
564
- 

Return to bug 33339