Sync with import/

This commit is contained in:
Alexey Ivanov 2015-03-13 08:17:18 +00:00
parent 5d67bdf85d
commit fc6ddfc7da

View file

@ -239,7 +239,7 @@ Requires(pre): rpm-helper
# without replacement, maybe it will come back later # without replacement, maybe it will come back later
Obsoletes: %{name}-swat < 4.1.6 Obsoletes: %{name}-swat < 4.1.6
#Samba-server and it's libraries were shipped in single package before 4.1.16 #Samba-server and it's libraries were shipped in single package before 4.1.16
Obsoletes: %{name}-server < 4.1.16 Obsoletes: %{name}-server < 1:4.1.17
%if %{without gtk} %if %{without gtk}
Obsoletes: %{name}-domainjoin-gui < %{EVRD} Obsoletes: %{name}-domainjoin-gui < %{EVRD}
%endif %endif
@ -735,8 +735,8 @@ fi
Summary: Name Service Switch service for WINS Summary: Name Service Switch service for WINS
Group: System/Libraries Group: System/Libraries
Requires: %{name}-common = %{EVRD} Requires: %{name}-common = %{EVRD}
Conflicts: nss_wins < 1:4.1.16 Conflicts: nss_wins < 1:4.1.17
Obsoletes: nss_wins < 1:4.1.16 Obsoletes: nss_wins < 1:4.1.17
Provides: nss_wins = %{EVRD} Provides: nss_wins = %{EVRD}
Requires(pre): glibc Requires(pre): glibc