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

(-)a/alt/lvm2.spec (-12 / +45 lines)
Lines 15-20 Link Here
15
%def_enable blkid_wiping
15
%def_enable blkid_wiping
16
%def_disable lvmdbusd
16
%def_disable lvmdbusd
17
%def_enable dmfilemapd
17
%def_enable dmfilemapd
18
%def_enable systemd
19
%def_enable thin
18
20
19
%if_enabled lvmlockd
21
%if_enabled lvmlockd
20
 %def_enable lvmlockd_sanlock
22
 %def_enable lvmlockd_sanlock
Lines 26-32 Link Here
26
Summary: Userland logical volume management tools
28
Summary: Userland logical volume management tools
27
Name: lvm2
29
Name: lvm2
28
Version: %lvm2version
30
Version: %lvm2version
29
Release: alt1
31
Release: alt2
30
License: GPL
32
License: GPL
31
33
32
Group: System/Base
34
Group: System/Base
Lines 47-62 Requires: dmsetup >= %{dmversion}-%{release} Link Here
47
Requires: dmeventd >= %{dmversion}-%{release}
49
Requires: dmeventd >= %{dmversion}-%{release}
48
Requires: liblvm2  = %{lvm2version}-%{release}
50
Requires: liblvm2  = %{lvm2version}-%{release}
49
51
50
51
BuildRequires: gcc-c++
52
BuildRequires: gcc-c++
52
BuildRequires: libreadline-devel libtinfo-devel libudev-devel CUnit-devel
53
BuildRequires: libreadline-devel libtinfo-devel libudev-devel CUnit-devel
54
%if_enabled systemd
55
# libudev-devel >= 205 required for udev-systemd-background-jobs
53
BuildRequires: libudev-devel >= 205
56
BuildRequires: libudev-devel >= 205
54
BuildRequires: systemd-devel
57
BuildRequires: systemd-devel
55
BuildRequires: thin-provisioning-tools >= 0.7.0
58
BuildRequires: thin-provisioning-tools >= 0.7.0
59
%else
60
BuildRequires: libudev-devel
61
%endif
56
BuildRequires: python-devel python-module-setuptools
62
BuildRequires: python-devel python-module-setuptools
57
BuildRequires(pre): rpm-build-python3
63
BuildRequires(pre): rpm-build-python3
58
BuildRequires: python3-devel python3-module-setuptools
64
BuildRequires: python3-devel python3-module-setuptools
59
BuildRequires: autoconf-archive
65
BuildRequires: autoconf-archive
66
%{?_enable_thin:BuildRequires: thin-provisioning-tools >= 0.5.4}
60
%{?_enable_lvmdbusd:BuildRequires: python-module-dbus python-module-pyudev python3-module-dbus python3-module-pyudev}
67
%{?_enable_lvmdbusd:BuildRequires: python-module-dbus python-module-pyudev python3-module-dbus python3-module-pyudev}
61
%{?_enable_static:BuildRequires: libreadline-devel-static libtinfo-devel-static}
68
%{?_enable_static:BuildRequires: libreadline-devel-static libtinfo-devel-static}
62
%{?_enable_cluster:BuildRequires: libcorosync2-devel libdlm-devel}
69
%{?_enable_cluster:BuildRequires: libcorosync2-devel libdlm-devel}
Lines 228-234 logical volumes, physical volumes, and volume groups. Link Here
228
235
229
%prep
236
%prep
230
%setup
237
%setup
231
232
%patch -p1
238
%patch -p1
233
239
234
%build
240
%build
Lines 259-270 export ac_cv_path_MODPROBE_CMD=%_sbindir/modprobe Link Here
259
	--with-default-locking-dir=%_lockdir/lvm
265
	--with-default-locking-dir=%_lockdir/lvm
260
266
261
	#
267
	#
262
%__make libdm
268
%make libdm
263
%__make lib
269
%make lib
264
%__make -C tools lvm.static
270
%make -C tools lvm.static
265
mv tools/lvm.static .
271
mv tools/lvm.static .
266
mv libdm/ioctl/libdevmapper.a .
272
mv libdm/ioctl/libdevmapper.a .
267
%__make clean
273
%make clean
268
%endif # static
274
%endif # static
269
275
270
# dynamic
276
# dynamic
Lines 302-308 mv libdm/ioctl/libdevmapper.a . Link Here
302
	%{?_enable_lvmlockd_sanlock:--enable-lvmlockd-sanlock} \
308
	%{?_enable_lvmlockd_sanlock:--enable-lvmlockd-sanlock} \
303
	%{?_enable_lvmdbusd:--enable-dbus-service} \
309
	%{?_enable_lvmdbusd:--enable-dbus-service} \
304
	--with-dmeventd-path="%_sbindir/dmeventd" \
310
	--with-dmeventd-path="%_sbindir/dmeventd" \
305
	--with-systemdsystemunitdir=%_unitdir \
311
	%{?_enable_systemd:--with-systemdsystemunitdir=%_unitdir} \
306
	--with-tmpfilesdir=%_tmpfilesdir \
312
	--with-tmpfilesdir=%_tmpfilesdir \
307
	--with-default-pid-dir=%_runtimedir \
313
	--with-default-pid-dir=%_runtimedir \
308
	--with-default-dm-run-dir=%_runtimedir \
314
	--with-default-dm-run-dir=%_runtimedir \
Lines 318-338 mv libdm/ioctl/libdevmapper.a . Link Here
318
	--with-cache-dump=/usr/sbin/cache_dump \
324
	--with-cache-dump=/usr/sbin/cache_dump \
319
	--with-cache-repair=/usr/sbin/cache_repair \
325
	--with-cache-repair=/usr/sbin/cache_repair \
320
	--with-cache-restore=/usr/sbin/cache_restore \
326
	--with-cache-restore=/usr/sbin/cache_restore \
327
%if_enabled thin
321
	--with-thin=internal \
328
	--with-thin=internal \
322
	--with-thin-check=/usr/sbin/thin_check \
329
	--with-thin-check=/usr/sbin/thin_check \
323
	--with-thin-dump=/usr/sbin/thin_dump \
330
	--with-thin-dump=/usr/sbin/thin_dump \
324
	--with-thin-repair=/usr/sbin/thin_repair \
331
	--with-thin-repair=/usr/sbin/thin_repair \
325
	--with-thin-restore=/usr/sbin/thin_restore \
332
	--with-thin-restore=/usr/sbin/thin_restore \
333
%endif
326
	--enable-python2-bindings \
334
	--enable-python2-bindings \
327
	--enable-python3-bindings
335
	--enable-python3-bindings
328
336
329
%__make
337
%make
330
338
331
%install
339
%install
332
%makeinstall_std
340
%makeinstall_std
333
%makeinstall_std install_system_dirs
341
%makeinstall_std install_system_dirs
342
%if_enabled systemd
334
%makeinstall_std install_systemd_units
343
%makeinstall_std install_systemd_units
335
%makeinstall_std install_systemd_generators
344
%makeinstall_std install_systemd_generators
345
%endif
336
%makeinstall_std install_tmpfiles_configuration
346
%makeinstall_std install_tmpfiles_configuration
337
347
338
chmod -R u+rwX %buildroot
348
chmod -R u+rwX %buildroot
Lines 364-370 ln -sf ../../%_lib/liblvm2app.so.2.2 ./liblvm2app.so Link Here
364
popd
374
popd
365
375
366
# Fix pkgconfig file.
376
# Fix pkgconfig file.
367
%__subst '/^Version:/ s/"\([^[:space:]]\+\)[^"]*"/\1/' %buildroot%_pkgconfigdir/*
377
subst '/^Version:/ s/"\([^[:space:]]\+\)[^"]*"/\1/' %buildroot%_pkgconfigdir/*
368
378
369
# provide a symlink for devmapper.pc
379
# provide a symlink for devmapper.pc
370
ln -sf devmapper.pc %buildroot%_pkgconfigdir/libdevmapper.pc
380
ln -sf devmapper.pc %buildroot%_pkgconfigdir/libdevmapper.pc
Lines 379-385 install -m 0755 %SOURCE4 %buildroot%_initdir/lvm2-lvmetad Link Here
379
install -m 0755 %SOURCE5 %buildroot%_initdir/blk-availability
389
install -m 0755 %SOURCE5 %buildroot%_initdir/blk-availability
380
install -m 0755 %SOURCE6 %buildroot%_initdir/lvm2-lvmpolld
390
install -m 0755 %SOURCE6 %buildroot%_initdir/lvm2-lvmpolld
381
391
392
%if_enabled cluster
382
mv %buildroot%_prefix/sbin/clvmd %buildroot%_sbindir/
393
mv %buildroot%_prefix/sbin/clvmd %buildroot%_sbindir/
394
%endif
383
mkdir -p %buildroot%_sysconfdir/sysconfig
395
mkdir -p %buildroot%_sysconfdir/sysconfig
384
cat << __EOF__ > %buildroot%_sysconfdir/sysconfig/clvmd
396
cat << __EOF__ > %buildroot%_sysconfdir/sysconfig/clvmd
385
START_CLVM=yes
397
START_CLVM=yes
Lines 440-459 __EOF__ Link Here
440
%config(noreplace) %_sysconfdir/lvm/lvmlocal.conf
452
%config(noreplace) %_sysconfdir/lvm/lvmlocal.conf
441
%config(noreplace) %verify(not md5 mtime size) %_sysconfdir/lvm/profile/*.profile
453
%config(noreplace) %verify(not md5 mtime size) %_sysconfdir/lvm/profile/*.profile
442
%_initdir/lvm2-monitor
454
%_initdir/lvm2-monitor
455
%if_enabled systemd
443
%_unitdir/lvm2-monitor.service
456
%_unitdir/lvm2-monitor.service
444
%_initdir/blk-availability
445
%_unitdir/blk-availability.service
457
%_unitdir/blk-availability.service
458
%endif
459
%_initdir/blk-availability
446
%if_enabled lvmetad
460
%if_enabled lvmetad
447
%_initdir/lvm2-lvmetad
461
%_initdir/lvm2-lvmetad
462
%if_enabled systemd
448
%_unitdir/lvm2-lvmetad*
463
%_unitdir/lvm2-lvmetad*
449
%_unitdir/lvm2-pvscan@.service
464
%_unitdir/lvm2-pvscan@.service
465
%endif
450
%_udevrulesdir/69-dm-lvm-metad.rules
466
%_udevrulesdir/69-dm-lvm-metad.rules
451
%endif
467
%endif
452
%if_enabled lvmpolld
468
%if_enabled lvmpolld
453
%_initdir/lvm2-lvmpolld
469
%_initdir/lvm2-lvmpolld
470
%if_enabled systemd
454
%_unitdir/lvm2-lvmpolld*
471
%_unitdir/lvm2-lvmpolld*
455
%endif
472
%endif
473
%endif
474
%if_enabled systemd
456
/lib/systemd/system-generators/lvm2-activation-generator
475
/lib/systemd/system-generators/lvm2-activation-generator
476
%endif
457
%_tmpfilesdir/%name.conf
477
%_tmpfilesdir/%name.conf
458
%dir %_sysconfdir/lvm
478
%dir %_sysconfdir/lvm
459
%dir %_sysconfdir/lvm/profile
479
%dir %_sysconfdir/lvm/profile
Lines 472-479 __EOF__ Link Here
472
%if_enabled cluster
492
%if_enabled cluster
473
%files -n clvm
493
%files -n clvm
474
%config(noreplace) %_sysconfdir/sysconfig/clvmd
494
%config(noreplace) %_sysconfdir/sysconfig/clvmd
495
%if_enabled systemd
475
%_unitdir/lvm2-c*.service
496
%_unitdir/lvm2-c*.service
476
/lib/systemd/lvm2-cluster-activation
497
/lib/systemd/lvm2-cluster-activation
498
%endif
477
%_sbindir/clvmd
499
%_sbindir/clvmd
478
%_man8dir/clvmd*
500
%_man8dir/clvmd*
479
%endif
501
%endif
Lines 517-524 __EOF__ Link Here
517
539
518
%files -n dmeventd
540
%files -n dmeventd
519
%_sbindir/dmeventd
541
%_sbindir/dmeventd
542
%if_enabled systemd
520
%_unitdir/dm-event.service
543
%_unitdir/dm-event.service
521
%_unitdir/dm-event.socket
544
%_unitdir/dm-event.socket
545
%endif
522
546
523
%files -n libdevmapper-event
547
%files -n libdevmapper-event
524
/%_lib/libdevmapper-event.so.*
548
/%_lib/libdevmapper-event.so.*
Lines 536-542 __EOF__ Link Here
536
%_sbindir/lvmlockd
560
%_sbindir/lvmlockd
537
%_sbindir/lvmlockctl
561
%_sbindir/lvmlockctl
538
%_man8dir/lvmlockd*
562
%_man8dir/lvmlockd*
563
%if_enabled systemd
539
%_unitdir/lvm2-lvmlock*
564
%_unitdir/lvm2-lvmlock*
565
%endif
540
%_initdir/lvm2-lvmlock*
566
%_initdir/lvm2-lvmlock*
541
%endif
567
%endif
542
568
Lines 545-551 __EOF__ Link Here
545
%_sysconfdir/dbus-1/system.d/com.redhat.lvmdbus1.conf
571
%_sysconfdir/dbus-1/system.d/com.redhat.lvmdbus1.conf
546
%_datadir/dbus-1/system-services/com.redhat.lvmdbus1.service
572
%_datadir/dbus-1/system-services/com.redhat.lvmdbus1.service
547
%_man8dir/lvmdbusd.*
573
%_man8dir/lvmdbusd.*
574
%if_enabled systemd
548
%_unitdir/lvm2-lvmdbusd.service
575
%_unitdir/lvm2-lvmdbusd.service
576
%endif
549
%python3_sitelibdir/lvmdbusd/*
577
%python3_sitelibdir/lvmdbusd/*
550
%endif
578
%endif
551
579
Lines 556-561 __EOF__ Link Here
556
%python3_sitelibdir/*
584
%python3_sitelibdir/*
557
585
558
%changelog
586
%changelog
587
* Thu Nov 16 2017 Michael Shigorin <mike@altlinux.org> 2.02.176-alt2
588
- BOOTSTRAP: introduce systemd, thin knobs (on by default)
589
  + conditionally loosen BR: libudev-devel as 205+ isn't
590
    a strict requirement for a build without systemd support
591
- internal macros cleaned up
592
559
* Fri Nov 10 2017 Alexey Shabalin <shaba@altlinux.ru> 2.02.176-alt1
593
* Fri Nov 10 2017 Alexey Shabalin <shaba@altlinux.ru> 2.02.176-alt1
560
- 2.02.176
594
- 2.02.176
561
595
562
- 

Return to bug 33339