File vdsm.spec.rej of Package vdsm - j0ke.net Open Build Service

File vdsm.spec.rej of Package vdsm (Revision 2)

Currently displaying revision 2, show latest

***************
*** 60,66 ****
  #  ./autogen.sh --system
  #  make VERSION={version}-{vdsm_release} dist
  Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
- 
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: python
--- 62,69 ----
  #  ./autogen.sh --system
  #  make VERSION={version}-{vdsm_release} dist
  Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+ Patch0:		vdsm_reg-lsb.patch
+ Patch1:		vdsm_init-lsbfixes.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: python
***************
*** 179,188 ****
  Requires: kernel >= 2.6.32-279.9.1
  Requires: sanlock >= 2.3-4, sanlock-python
  Requires: initscripts >= 9.03.31-2.el6_3.1
  Requires: policycoreutils >= 2.0.83-19.30
  Requires: policycoreutils-python >= 2.0.83-19.30
- Requires: python-pthreading
  Requires: selinux-policy-targeted >= 3.7.19-155
  Requires: lvm2 >= 2.02.95-10.el6_3.2
  Requires: logrotate < 3.8.0
  %endif
--- 196,207 ----
  Requires: kernel >= 2.6.32-279.9.1
  Requires: sanlock >= 2.3-4, sanlock-python
  Requires: initscripts >= 9.03.31-2.el6_3.1
+ %if 0%{!?suse_version}
  Requires: policycoreutils >= 2.0.83-19.30
  Requires: policycoreutils-python >= 2.0.83-19.30
  Requires: selinux-policy-targeted >= 3.7.19-155
+ %endif
+ Requires: python-pthreading
  Requires: lvm2 >= 2.02.95-10.el6_3.2
  Requires: logrotate < 3.8.0
  %endif
***************
*** 241,254 ****
  Requires: tree
  Requires: dosfstools
  Requires: genisoimage
  Requires: libselinux-python
  Requires: %{name}-python = %{version}-%{release}
  Requires: pyparted
  
  Requires(post): /usr/sbin/saslpasswd2
  Requires(post): /bin/hostname
  Requires(post): policycoreutils-python
  Requires(preun): policycoreutils-python
  
  %description
  The VDSM service is required by a Virtualization Manager to manage the
--- 262,279 ----
  Requires: tree
  Requires: dosfstools
  Requires: genisoimage
+ %if 0%{!?suse_version}
  Requires: libselinux-python
+ %endif
  Requires: %{name}-python = %{version}-%{release}
  Requires: pyparted
  
  Requires(post): /usr/sbin/saslpasswd2
  Requires(post): /bin/hostname
+ %if 0%{!?suse_version}
  Requires(post): policycoreutils-python
  Requires(preun): policycoreutils-python
+ %endif
  
  %description
  The VDSM service is required by a Virtualization Manager to manage the
***************
*** 571,577 ****
  
  %prep
  %setup -q
- %if 0%{?rhel} == 6
  sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
  %endif
  
--- 695,703 ----
  
  %prep
  %setup -q
+ %patch0
+ %patch1
+ %if 0%{?rhel} == 6 || 0%{?sles_version} == 11
  sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
  %endif
  
***************
*** 695,713 ****
  fi
  
  # hack until we replace core dump with abrt
- /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
- /sbin/restorecon -R -v /var/log/core
  
- %if 0%{?rhel}
  if [ "$1" -eq 1 ] ; then
-     /sbin/chkconfig --add vdsmd
-     /sbin/chkconfig --add supervdsmd
-     /sbin/chkconfig --add vdsm-restore-net-config
  
      # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
      /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
          '/var/run/vdsm(/.*)?'
-     /sbin/restorecon /var/run/vdsm
  fi
  %else
  %if 0%{?with_systemd}
--- 828,848 ----
  fi
  
  # hack until we replace core dump with abrt
+ [ -x /usr/sbin/semanage ] && /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
+ [ -x /sbin/restorecon ] && /sbin/restorecon -R -v /var/log/core
  
+ %if 0%{?rhel} || 0%{?sles_version} == 11
  if [ "$1" -eq 1 ] ; then
+     /sbin/chkconfig --add vdsmd || :
+     /sbin/chkconfig --add supervdsmd || :
+     /sbin/chkconfig --add vdsm-restore-net-config || :
  
      # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
+     if [ -x /usr/sbin/semanage ] ; then
      /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
          '/var/run/vdsm(/.*)?'
+     /sbin/restorecon /var/run/vdsm || :
+     fi
  fi
  %else
  %if 0%{?with_systemd}
***************
*** 906,911 ****
  %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
  %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
  %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
  %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
  %if 0%{?with_systemd}
  %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
--- 1055,1061 ----
  %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
  %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
  %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
+ %dir %{_sysconfdir}/sysctl.d
  %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
  %if 0%{?with_systemd}
  %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf