Changes - j0ke.net Open Build Service

Changes of Revision 51

[-] [+]	Changed	MozillaFirefox.spec
@@ -12,22 +12,22 @@ Name: MozillaFirefox BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel unzip update-desktop-files zip -%if %suse_version >= 1000 -%if %suse_version <= 1010 +%if 0%{?suse_version} >= 1000 +%if 0%{?suse_version} <= 1010 BuildRequires: dbus-1-devel %else BuildRequires: dbus-1-glib-devel %endif %endif -%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 libgnomeui %endif License: MPL/GPL/LGPL @@ -116,13 +116,13 @@ %define has_system_nspr 0 %define has_system_nss 0 %define has_system_cairo 0 -%if %suse_version > 930 \|\| 0%{opensuse_bs} +%if 0%{?suse_version} > 930 \|\| 0%{?opensuse_bs} %define has_system_nspr 1 %endif -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %define has_system_cairo 1 %endif -%if %suse_version > 1010 \|\| 0%{opensuse_bs} +%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} %define has_system_nss 1 %endif %if %has_system_nspr @@ -134,12 +134,12 @@ %define _unpackaged_files_terminate_build 0 %define releasedate 2008020300 %define progname firefox -%if %suse_version < 1010 +%if 0%{?suse_version} < 1010 %define progdir /opt/MozillaFirefox/%_lib %else %define progdir %{_prefix}/%_lib/firefox %endif -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %define gnome_confdir %{_sysconfdir} %define gnome_dir %{_prefix} %gconf_schemas_prereq @@ -150,13 +150,13 @@ %define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) %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 %endif # let add-plugins.sh maintain Java -%if %suse_version <= 1000 +%if 0%{?suse_version} <= 1000 %define JAVA 1 %else %define JAVA 0 @@ -246,7 +246,7 @@ 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 export CXXFLAGS="$CFLAGS" @@ -279,7 +279,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug EOF -%if %is_plus \|\| %suse_version >= 930 +%if %is_plus \|\| 0%{?suse_version} >= 930 cat << EOF >> $MOZCONFIG ac_add_options --enable-pango EOF @@ -299,13 +299,13 @@ ac_add_options --enable-system-cairo EOF %endif -%if %suse_version >= 1000 +%if 0%{?suse_version} >= 1000 cat << EOF >> $MOZCONFIG ac_add_options --enable-dbus ac_add_options --enable-extensions="dbus default" EOF %endif -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 cat << EOF >> $MOZCONFIG ac_add_options --enable-startup-notification EOF @@ -357,7 +357,7 @@ $RPM_BUILD_ROOT/opt/gnome/share/applications/%{name}.desktop %else mkdir -p $RPM_BUILD_ROOT/usr/share/applications -%if %suse_version < 1010 +%if 0%{?suse_version} < 1010 # no startup notification for 10.0 and older sed "s:StartupNotify=true:StartupNotify=false:g" \ %{SOURCE1} > $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop @@ -430,7 +430,7 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires} %endif -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %find_gconf_schemas %fdupes $RPM_BUILD_ROOT%{progdir} %fdupes $RPM_BUILD_ROOT%{_datadir} @@ -444,7 +444,7 @@ rm -f %{my_requires} %endif -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun @@ -460,7 +460,7 @@ if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null \|\| : fi -%if %suse_version >= 1030 +%if 0%{?suse_version} >= 1030 if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null \|\| : fi @@ -469,7 +469,7 @@ opt/gnome/bin/update-mime-database > /dev/null \|\| : fi %endif -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 # move plugins to new location if [ "$1" = "2" ]; then if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then @@ -479,11 +479,11 @@ fi fi %endif -%if %suse_version <= 1020 +%if 0%{?suse_version} <= 1020 if [ ! -f /.buildenv ]; then export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source` %{gnome_dir}bin/gconftool-2 --makefile-install-rule %{gnome_confdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1 -%if %suse_version <= 1000 +%if 0%{?suse_version} <= 1000 # restart gconfd killall -HUP gconfd-2 2>&1 >/dev/null %endif @@ -496,7 +496,7 @@ if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null \|\| : fi -%if %suse_version >= 1030 +%if 0%{?suse_version} >= 1030 if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null \|\| : fi @@ -507,7 +507,7 @@ %endif -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %posttrans -f %{name}.schemas_posttrans %endif @@ -519,7 +519,7 @@ %{progdir}/add-plugins.sh > /dev/null 2>&1 exit 0 -%if %suse_version <= 1000 +%if 0%{?suse_version} <= 1000 %triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin %{progdir}/add-plugins.sh > /dev/null 2>&1 exit 0 @@ -532,13 +532,13 @@ exit 0 %endif