Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	MozillaSunbird.spec
@@ -12,15 +12,15 @@ Name: MozillaSunbird BuildRequires: gcc-c++ libgnomeui-devel libidl-devel orbit-devel update-desktop-files zip -%if 0%{?suse_version} > 1020 +%if %suse_version > 1020 BuildRequires: fdupes %endif # fix broken 9.3 requirements -%if 0%{?suse_version} <= 930 +%if %suse_version <= 930 BuildRequires: freetype2-devel popt-devel %endif # fix broken SLES9 requirements -%if 0%{?suse_version} == 910 +%if %suse_version == 910 BuildRequires: pkgconfig gnome-vfs2 libgnome libgnomeui %endif License: MPL/GPL/LGPL @@ -45,10 +45,10 @@ %define progdir %{_prefix}/%_lib/%{progname} %define my_provides /tmp/my-provides %define my_requires /tmp/my-requires -%if 0%{?suse_version} > 930 +%if %suse_version > 930 BuildRequires: mozilla-nspr-devel %endif -%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} +%if %suse_version > 1010 \|\| %opensuse_bs BuildRequires: mozilla-nss-devel %endif @@ -105,7 +105,7 @@ export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" -%if 0%{?suse_version} > 1000 +%if %suse_version > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif export CXXFLAGS="$CFLAGS" @@ -135,13 +135,13 @@ ac_add_options --enable-official-branding #ac_add_options --enable-debug EOF -%if 0%{?suse_version} > 930 +%if %suse_version > 930 cat << EOF >> $MOZCONFIG ac_add_options --with-system-nspr ac_add_options --enable-system-cairo EOF %endif -%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} +%if %suse_version > 1010 \|\| %opensuse_bs cat << EOF >> $MOZCONFIG ac_add_options --with-system-nss EOF @@ -179,7 +179,7 @@ cp -f $RPM_BUILD_ROOT%{progdir}/chrome/icons/default/default.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm %suse_update_desktop_file %{progname} Office Calendar GTK # modify provides and requires lists -%if 0%{?suse_version} == 1000 \|\| 0%{?suse_version} == 1010 +%if %suse_version == 1000 \|\| %suse_version == 1010 cat << EOF > %{my_provides} grep -vE "libnss3.so\|libnssckbi.so\|libsmime3.so\|libsoftokn3.so\|libssl3.so\|libfreebl3.so" \| %{__find_provides} EOF @@ -191,14 +191,14 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires} %endif -%if 0%{?suse_version} > 1020 +%if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{progdir} %fdupes $RPM_BUILD_ROOT%{_datadir} %endif %clean rm -rf $RPM_BUILD_ROOT -%if 0%{?suse_version} == 1000 \|\| 0%{?suse_version} == 1010 +%if %suse_version == 1000 \|\| %suse_version == 1010 rm -f %{my_provides} rm -f %{my_requires} %endif @@ -227,13 +227,13 @@ %{progdir}/js/ %{progdir}/res/ # NSPR -%if 0%{?suse_version} <= 930 +%if %suse_version <= 930 %{progdir}/libnspr4.so %{progdir}/libplc4.so %{progdir}/libplds4.so %endif # NSS -%if 0%{?suse_version} <= 1010 && !0%{?opensuse_bs} +%if %suse_version <= 1010 && !%opensuse_bs %{progdir}/libnss3.so %{progdir}/libnssckbi.so %{progdir}/libsmime3.so