rpm: drop no longer present clvmd, lvm2app

diff --git a/spec/packages.inc b/spec/packages.inc
index cdcc197d05a9fbb69bfaa31a14ea0bd3353b8efb..bf2432a56b198d7678ad23f0b478009e4afafcd6 100644 (file)
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -229,11 +229,8 @@ the lvm2 libraries.
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/liblvm2app.so
 %{_libdir}/liblvm2cmd.so
-%{_includedir}/lvm2app.h
 %{_includedir}/lvm2cmd.h
-%{_libdir}/pkgconfig/lvm2app.pc
 %{_libdir}/libdevmapper-event-lvm2.so
 
 %package libs
@@ -251,7 +248,6 @@ This package contains shared lvm2 libraries for applications.
 
 %files libs
 %defattr(-,root,root,-)
-%attr(755,root,root) %{_libdir}/liblvm2app.so.*
 %attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.*
 %dir %{_libdir}/device-mapper
@@ -291,10 +287,8 @@ LVM commands use lvmlockd to coordinate access to shared storage.
 %post lockd
 %daemon_reload
 %enable -s lvmlockd -t service
-%enable -s lvmlocking -t service
 
 %preun lockd
-%disable -s lvmlocking -t service
 %disable -s lvmlockd -t service
 
 %postun lockd
@@ -309,66 +303,6 @@ fi
 %{_mandir}/man8/lvmlockctl.8.gz
 %dir %{_default_locking_dir}
 %{_unitdir}/lvm2-lvmlockd.service
-%{_unitdir}/lvm2-lvmlocking.service
-%endif
-
-##############################################################################
-# Cluster subpackage
-##############################################################################
-%if %{have_with clvmd}
-
-%package cluster
-Summary: Cluster extensions for userland logical volume management tools
-License: GPLv2
-Group: System Environment/Base
-Requires: lvm2 >= %{version}-%{release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): device-mapper >= %{device_mapper_version}
-Requires(preun): lvm2 >= 2.02
-%maybe Requires: %{req_cluster}
-
-%description cluster
-
-Extensions to LVM2 to support clusters.
-
-%post cluster
-%daemon_reload
-%enable -s clvmd -t service
-%if %{have_service clvmd}
-if [ $1 = 2 ]; then
-       if [ -e %{_default_pid_dir}/clvmd.pid ]; then
-               %{_sbindir}/clvmd -S >/dev/null 2>&1 || :
-       fi
-fi
-%endif
-
-%preun cluster
-%disable -s clvmd -t service
-%if %{have_service clvmd}
-if [ $1 = 0 ]; then
-       # lvmconf may no longer exist if lvm2 is being removed in the same rpm run
-       if test -x /sbin/lvmconf; then /sbin/lvmconf --disable-cluster; fi
-fi
-%endif
-
-%postun cluster
-if [ $1 = 0 ]; then
-%daemon_reload
-fi
-
-%files cluster
-%defattr(-,root,root,-)
-%attr(755,root,root) /usr/sbin/clvmd
-%{_mandir}/man8/clvmd.8.gz
-%if %{enable_systemd}
-  %{_unitdir}/lvm2-clvmd.service
-  %{_unitdir}/lvm2-cluster-activation.service
-  %{_unitdir}/../lvm2-cluster-activation
-%else
-  %{_sysconfdir}/rc.d/init.d/clvmd
-%endif
-
 %endif
 
 ##############################################################################
@@ -412,42 +346,6 @@ fi
 
 %endif
 
-##############################################################################
-# Python bindings
-##############################################################################
-%if %{enable_python}
-%package python-libs
-Summary: Python module to access LVM
-License: LGPLv2
-Group: Development/Libraries
-Provides: python-lvm = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description python-libs
-Python module to allow the creation and use of LVM
-logical volumes, physical volumes, and volume groups.
-
-%files python-libs
-%{python_sitearch}/*
-%endif
-
-%if %{enable_python3}
-%package python3-libs
-Summary: Python 3 module to access LVM
-License: LGPLv2
-Group: Development/Libraries
-Provides: python3-lvm = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description python3-libs
-Python 3 module to allow the creation and use of LVM
-logical volumes, physical volumes, and volume groups.
-
-%files python3-libs
-%{python3_sitearch}/*.so
-%{python3_sitearch}/*.egg-info
-%endif
-
 ##############################################################################
 # LVM D-Bus daemon
 ##############################################################################

diff --git a/spec/source.inc b/spec/source.inc
index fb7ccf5dce51725e7cfff14ed8d30726b4086a30..6a485efa86633d10d21cec68d2227dc19db84b26 100644 (file)
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -30,7 +30,6 @@
 # enable service only if you know what you are doing
 #
 %if %{enable_cmirror}
-#service clvmd 1
 #service cmirrord 1
 %endif