Author: dmacvicar Date: Thu Mar 24 16:41:11 2011 New Revision: 63669 URL: http://svn.opensuse.org/viewcvs/yast?rev=63669&view=rev Log: remove dependencies Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Modified: branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in?rev=63669&r1=63668&r2=63669&view=diff ============================================================================== --- branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in (original) +++ branches/tmp/dmacvicar/zc10/packager/yast2-packager.spec.in Thu Mar 24 16:41:11 2011 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp +BuildRequires: gcc-c++ libxcrypt-devel yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # HTTP.ycp BuildRequires: yast2-transfer @@ -13,8 +13,14 @@ # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 +%if 0%{?suse_version} >= 1100 # Newly added RPM Requires: yast2-country-data >= 2.16.3 +BuildRequires: yast2-country-data +%else +Requires: yast2-country +BuildRequires: yast2-country +%endif # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org