Changes - j0ke.net Open Build Service

Changes of Revision 34

[-] [+]	Changed	MozillaThunderbird.spec
@@ -12,15 +12,15 @@ Name: MozillaThunderbird BuildRequires: gcc-c++ libgnomeui-devel libidl-devel orbit-devel update-desktop-files zip unzip -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif # fix broken 9.3 requirements -%if %suse_version <= 930 +%if 0%{?suse_version} <= 930 BuildRequires: freetype2-devel popt-devel %endif # fix broken SLES9 requirements -%if %suse_version == 910 +%if 0%{?suse_version} == 910 BuildRequires: pkgconfig gnome-vfs2 libgnome libgnomeui %endif License: MPL/GPL/LGPL @@ -61,16 +61,16 @@ Patch27: thunderbird-1.5.0.8-uninitalized-vars-232305.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Suggests: %{name}-translations %endif %define has_system_cairo 0 %define has_system_nspr 0 %define has_system_nss 0 -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %define has_system_cairo 1 %endif -%if %suse_version > 1010 \|\| %opensuse_bs +%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} %define has_system_nspr 1 # NSS version on 10.1 is too old %define has_system_nss 1 @@ -88,7 +88,7 @@ %define progdir %{_prefix}/%_lib/thunderbird %define my_provides /tmp/my-provides %define my_requires /tmp/my-requires -%if %suse_version > 920 +%if 0%{?suse_version} > 920 %define libgssapi libgssapi_krb5.so.2 %else %define libgssapi libgssapi.so.1 @@ -100,7 +100,7 @@ ### build options end %if %build_enigmail Requires: /usr/bin/gpg -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 Requires: pinentry-dialog %endif %endif @@ -187,16 +187,16 @@ export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing" -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif # enigmail build fails with visibility enabled -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %ifarch x86_64 s390 s390x export ac_cv_visibility_hidden="no" %endif # hopefully only temporary change for gcc 4.3 -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 export ac_cv_visibility_hidden="no" %endif %endif @@ -223,7 +223,7 @@ #ac_add_options --enable-extensions=default,lightning ac_add_options --enable-default-toolkit=gtk2 ac_add_options --enable-xft -%if %suse_version > 920 +%if 0%{?suse_version} > 920 ac_add_options --enable-pango %endif ac_add_options --disable-freetype2 @@ -363,7 +363,7 @@ # mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/thunderbird.xpm -%if %suse_version > 820 +%if 0%{?suse_version} > 820 %suse_update_desktop_file %{name} Network Email GTK %endif %if !%has_system_nss @@ -379,7 +379,7 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires} %endif -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 # Some sites use different partitions for /usr/(lib\|lib64) and /usr/share. Since you # can't create hardlinks across partitions, we'll do this more than once. %fdupes $RPM_BUILD_ROOT%{progdir}