a2b212f0 | 2016-09-24 11:41:38 | François Andriot |
RPM packaging: fix tdelibs/tdebase build on opensuse 42.1/42.2 |
||
M redhat/main/tdebase/tdebase-14.0.0.spec M redhat/main/tdelibs/tdelibs-14.0.0.spec |
||
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 539b29d..b6fc673 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -309,7 +309,7 @@ %endif # OpenSuse 42.1 Theme -%if "%{?suse_version}" == "4210" +%if "%{?sle_version}" == "120100" Requires: wallpaper-branding = 42.1 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg Requires: hicolor-icon-theme-branding @@ -317,7 +317,7 @@ %endif # OpenSuse 42.2 Theme -%if "%{?suse_version}" == "4220" +%if "%{?sle_version}" == "120200" Requires: wallpaper-branding = 42.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg Requires: hicolor-icon-theme-branding diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index cb04e8f..93b4112 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -352,7 +352,7 @@ # UDISKS support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 -%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1320 +%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks |