Author: mvidner Date: Tue Apr 10 16:15:41 2012 New Revision: 67883 URL: http://svn.opensuse.org/viewcvs/yast?rev=67883&view=rev Log: license in spdx format; url; conflict with our old copy Modified: trunk/proxy/yast2-proxy.spec.in Modified: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67883&r1=67882&r2=67883&view=diff ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (original) +++ trunk/proxy/yast2-proxy.spec.in Tue Apr 10 16:15:41 2012 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files @@ -11,9 +11,13 @@ BuildRequires: yast2 Requires: yast2 +# we split off that one +Conflicts: yast2-network < 2.22.6 + PreReq: /bin/rm Summary: YaST2 - Proxy Configuration +Url: http://en.opensuse.org/Portal:YaST %description This package contains the YaST2 component for proxy configuration. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org