Changes - j0ke.net Open Build Service

Changes of Revision 40

[-] [+]	Changed	seamonkey.spec
@@ -11,14 +11,14 @@ Name: seamonkey 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 # fixing broken requirements on 9.3 -%if %suse_version <= 930 +%if 0%{?suse_version} <= 930 BuildRequires: freetype2-devel popt-devel # fix broken SLES9 requirements -%if %suse_version == 910 +%if 0%{?suse_version} == 910 BuildRequires: pkgconfig gnome-vfs2 libgnome libgnomeui %endif %endif @@ -29,7 +29,7 @@ Summary: The successor of the Mozilla Application Suite URL: http://www.mozilla.org/projects/seamonkey Group: Productivity/Networking/Web/Browsers -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla Obsoletes: mozilla %endif @@ -78,7 +78,7 @@ %define progdir %_libdir/%{progname} %define my_provides %{_tmppath}/my-provides %define my_requires %{_tmppath}/my-requires -%if %suse_version > 920 +%if 0%{?suse_version} > 920 %define libgssapi libgssapi_krb5.so.2 %else %define libgssapi libgssapi.so.1 @@ -88,17 +88,17 @@ %define debug 0 %define build_enigmail 1 ### build options end -%if %suse_version > 930 \|\| 0%{opensuse_bs} +%if 0%{?suse_version} > 930 \|\| 0%{?opensuse_bs} BuildRequires: mozilla-nspr-devel PreReq: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) %endif -%if %suse_version > 1010 \|\| 0%{opensuse_bs} +%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} BuildRequires: mozilla-nss-devel PreReq: mozilla-nss %endif %if %build_enigmail Requires: /usr/bin/gpg -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 Requires: pinentry-dialog %endif %endif @@ -120,7 +120,7 @@ Summary: The SeaMonkey Mail Client Group: Productivity/Networking/Email/Clients PreReq: %{name} = %{version} -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla-mail Obsoletes: mozilla-mail %endif @@ -139,7 +139,7 @@ Summary: IRC for SeaMonkey Group: Productivity/Networking/IRC PreReq: %{name} = %{version} -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla-irc Obsoletes: mozilla-irc %endif @@ -157,7 +157,7 @@ Summary: The SeaMonkey JavaScript Debugger Group: Development/Tools/Debuggers PreReq: %{name} = %{version} -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla-venkman Obsoletes: mozilla-venkman %endif @@ -175,7 +175,7 @@ Summary: The SeaMonkey DOM Inspector Group: Development/Tools/Navigators PreReq: %{name} = %{version} -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla-dom-inspector Obsoletes: mozilla-dom-inspector %endif @@ -195,10 +195,10 @@ Summary: A Spell Checker for SeaMonkey Group: Productivity/Networking/Email/Utilities PreReq: %{name} = %{version} -%if %suse_version > 820 +%if 0%{?suse_version} > 820 PreReq: myspell-dictionary %endif -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 Provides: mozilla-spellchecker Obsoletes: mozilla-spellchecker %endif @@ -250,16 +250,16 @@ export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -g -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 for gcc 4.3 -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 export ac_cv_visibility_hidden="no" %endif %endif @@ -270,7 +270,7 @@ --enable-extensions=default \ --enable-xinerama --enable-crypto \ --enable-reorder \ -%if %suse_version <= 920 +%if 0%{?suse_version} <= 920 --enable-strip \ %endif --enable-svg \ @@ -281,17 +281,17 @@ --disable-debug --disable-dtd-debug \ %endif --enable-xft \ -%if %suse_version > 930 +%if 0%{?suse_version} > 930 --enable-pango \ %endif --disable-freetype2 \ --enable-default-toolkit=gtk2 \ --with-default-mozilla-five-home=%{progdir} \ -%if %suse_version > 930 +%if 0%{?suse_version} > 930 --with-system-nspr \ --enable-system-cairo \ %endif -%if %suse_version > 1010 +%if 0%{?suse_version} > 1010 --with-system-nss \ %endif --libdir=%{progdir} \ @@ -368,14 +368,14 @@ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ --install-dir $RPM_BUILD_ROOT%{progdir} \ --install-root %{progdir} -%if %suse_version < 1000 +%if 0%{?suse_version} < 1000 %{SOURCE13} --package nspr \ --output-file %{_tmppath}/mozilla.list \ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ --install-dir $RPM_BUILD_ROOT%{progdir} \ --install-root %{progdir} %endif -%if %suse_version <= 1010 +%if 0%{?suse_version} <= 1010 %{SOURCE13} --package nss \ --output-file %{_tmppath}/mozilla.list \ --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \ @@ -438,7 +438,7 @@ cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/pref/all-novell.js rm suse-default-prefs # Desktop definition -%if %suse_version > 820 +%if 0%{?suse_version} > 820 mkdir -p $RPM_BUILD_ROOT/usr/share/applications install -m 644 $RPM_BUILD_DIR/*.desktop \ $RPM_BUILD_ROOT/usr/share/applications @@ -513,12 +513,12 @@ # touch $RPM_BUILD_ROOT%{progdir}/installed-chrome.d/manual touch $RPM_BUILD_ROOT%{progdir}/chrome/locale.alias -%if %suse_version > 820 +%if 0%{?suse_version} > 820 %suse_update_desktop_file seamonkey Network WebBrowser GTK %suse_update_desktop_file seamonkey-mail Network Email GTK %suse_update_desktop_file seamonkey-composer Network WebDevelopment GTK %endif -%if %suse_version == 1000 \|\| %suse_version == 1010 +%if 0%{?suse_version} == 1000 \|\| 0%{?suse_version} == 1010 # modify provides and requires lists cat << EOF > %{my_provides} grep -vE "libnss3.so\|libnssckbi.so\|libsmime3.so\|libsoftokn3.so\|libssl3.so" \| %{__find_provides} @@ -531,7 +531,7 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires}