rpms/sssd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix Obsoletes: to account for dist tag

Browse Source 
- Convert post and pre scripts to run on the sssd-common subpackage
- Remove old conversion from SYSV
This commit is contained in:
Stephen Gallagher 2013-07-01 18:57:07 -04:00
parent e7f2b6f482
commit 604fe3f870
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sssd.spec
View File

@ -16,7 +16,7 @@
Name: sssd Name: sssd
Version: 1.10.0 Version: 1.10.0
Release: 13%{?dist} Release: 14%{?dist}
Group: Applications/System Group: Applications/System
Summary: System Security Services Daemon Summary: System Security Services Daemon
License: GPLv3+ License: GPLv3+
@ -112,7 +112,7 @@ Group: Applications/System
License: GPLv3+ License: GPLv3+
# Conflicts # Conflicts
Conflicts: selinux-policy < 3.10.0-46 Conflicts: selinux-policy < 3.10.0-46
Conflicts: sssd < 1.10.0-8.beta2 Conflicts: sssd < 1.10.0-8%{?dist}.beta2
# Requires # Requires
Requires: libldb%{?_isa} = %{ldb_version} Requires: libldb%{?_isa} = %{ldb_version}
Requires: libtdb%{?_isa} >= 1.1.3 Requires: libtdb%{?_isa} >= 1.1.3
@ -125,11 +125,11 @@ Requires(postun): systemd-units chkconfig
### Provides ### ### Provides ###
Provides: libsss_sudo = %{version}-%{release} Provides: libsss_sudo = %{version}-%{release}
Obsoletes: libsss_sudo <= 1.10.0-7.beta1 Obsoletes: libsss_sudo <= 1.10.0-7%{?dist}.beta1
Provides: libsss_sudo-devel = %{version}-%{release} Provides: libsss_sudo-devel = %{version}-%{release}
Obsoletes: libsss_sudo-devel <= 1.10.0-7.beta1 Obsoletes: libsss_sudo-devel <= 1.10.0-7%{?dist}.beta1
Provides: libsss_autofs = %{version}-%{release} Provides: libsss_autofs = %{version}-%{release}
Obsoletes: libsss_autofs <= 1.10.0-7.beta1 Obsoletes: libsss_autofs <= 1.10.0-7%{?dist}.beta1
%description common %description common
Common files for the SSSD. The common package includes all the files needed Common files for the SSSD. The common package includes all the files needed
@ -670,33 +670,20 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitearch}/pysss_nss_idmap.so %{python_sitearch}/pysss_nss_idmap.so
%post %post common
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Initial installation # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi fi
%preun %preun common
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
# Package removal, not upgrade # Package removal, not upgrade
/bin/systemctl --no-reload disable sssd.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable sssd.service > /dev/null 2>&1 || :
/bin/systemctl stop sssd.service > /dev/null 2>&1 || : /bin/systemctl stop sssd.service > /dev/null 2>&1 || :
fi fi
%triggerun -- sssd < %{version}-%{release} %postun common
if /sbin/chkconfig --level 3 sssd ; then
/bin/systemctl --no-reload enable sssd.service >/dev/null 2>&1 || :
fi
if /sbin/chkconfig --level 5 sssd ; then
/bin/systemctl --no-reload enable sssd.service >/dev/null 2>&1 || :
fi
/sbin/chkconfig --del sssd >/dev/null 2>&1 || :
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
/bin/systemctl try-restart sssd.service >/dev/null 2>&1 || : /bin/systemctl try-restart sssd.service >/dev/null 2>&1 || :
@ -715,6 +702,11 @@ fi
%postun -n libsss_idmap -p /sbin/ldconfig %postun -n libsss_idmap -p /sbin/ldconfig
%changelog %changelog
* Mon Jul 01 2013 Stephen Gallagher <sgallagh@redhat.com> - 1.10.0-14
- Fix Obsoletes: to account for dist tag
- Convert post and pre scripts to run on the sssd-common subpackage
- Remove old conversion from SYSV
* Thu Jun 27 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.10.0-13 * Thu Jun 27 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.10.0-13
- New upstream release 1.10 - New upstream release 1.10
- https://fedorahosted.org/sssd/wiki/Releases/Notes-1.10.0 - https://fedorahosted.org/sssd/wiki/Releases/Notes-1.10.0