- merged 4.0.7 from PLD master
authorMarcin Krol <hawk@tld-linux.org>
Fri, 16 Mar 2018 17:24:01 +0000 (17:24 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Fri, 16 Mar 2018 17:24:01 +0000 (17:24 +0000)
dlm.spec

index 6bbb10adc91d95a3903d2655c008b23712a1b0b6..63f423f31e877a7c8d7a68ae972ee03976f6eea3 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,22 +1,21 @@
 #
 # Conditional build:
 %bcond_without dlm_stonith     # build without fencing helper
-#
+
 Summary:       General-purpose distributed lock manager
 Summary(pl.UTF-8):     Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:          dlm
-%define                _snap   4283123f0b13eafc46d825050c5142cf44be79c3
-Version:       4.0.3
+Version:       4.0.7
 Release:       1
 License:       LGPL v2.1+, GPL v2
 Group:         Libraries
-Source0:       https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{_snap}.tar.bz2
-# Source0-md5: 575174a0d7b0e1a6e45ec88f447c48cc
+Source0:       http://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
+# Source0-md5: aa604a10d5ac2d3414eb89ec6984cd12
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
-Source4:       dlm.conf
-Patch0:                no_systemd.patch
-Patch1:                old_udev_dir.patch
+Source4:       %{name}.conf
+Patch0:                old_udev_dir.patch
+Patch1:                no_systemd.patch
 URL:           http://sources.redhat.com/cluster/dlm/
 BuildRequires: corosync-devel >= 2.0
 %{?with_dlm_stonith:BuildRequires:     libxml2-devel >= 2.0}
@@ -43,7 +42,7 @@ użytkownika.
 %package libs
 Summary:       DLM libraries
 Summary(pl.UTF-8):     Biblioteki DLM
-Group:         Development/Libraries
+Group:         Libraries
 Obsoletes:     cluster-dlm-libs
 
 %description libs
@@ -66,8 +65,7 @@ Header files and development documentation for DLM.
 Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 
 %prep
-%setup -q -n %{name}-%{_snap}
-
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
@@ -118,20 +116,18 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
        HDRDIR=%{_includedir}
 %endif
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-
-%preun
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
        %service -q %{name} stop
        /sbin/chkconfig --del %{name}