Changes - j0ke.net Open Build Service

Changes of Revision 57

[-] [+]	Changed	mozilla-xulrunner181.spec
@@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner181 (Version 1.8.1.18) +# spec file for package mozilla-xulrunner181 (Version 1.8.1.22) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,32 +12,32 @@ Name: mozilla-xulrunner181 BuildRequires: gcc-c++ java-devel libgnomeui-devel libidl-devel update-desktop-files zip -%if 0%{?suse_version} > 1020 +%if %suse_version > 1020 BuildRequires: fdupes %endif License: LGPL, MPL -Version: 1.8.1.18 +Version: 1.8.1.22 Release: 1 Summary: Mozilla Runtime Environment 1.8.1.x URL: http://www.mozilla.org/ Group: Productivity/Other Provides: gecko181 -%if 0%{?suse_version} > 1010 +%if %suse_version > 1010 Obsoletes: mozilla-xulrunner # For upgrade from 10.2 betas: Obsoletes: mozilla-xulrunner180 %endif -%if 0%{?suse_version} == 1020 +%if %suse_version == 1020 %define ga_version 1.8.1b2 Provides: mozilla-xulrunner181 = 1.8.0.99 %endif -%if 0%{?suse_version} == 1030 +%if %suse_version == 1030 %define ga_version 1.8.1.4 %endif -%if 0%{?suse_version} == 1100 +%if %suse_version == 1100 %define ga_version 1.8.1.13 %endif -%if 0%{?suse_version} >= 1030 && 0%{?ga_version:1} +%if %suse_version >= 1030 && 0%{?ga_version:1} Provides: mozilla-xulrunner181 = %{ga_version} %endif Source: xulrunner-source-%{version}.tar.bz2 @@ -61,13 +61,13 @@ %define has_system_nspr 1 %define has_system_nss 0 %define pango 1 -%if 0%{?suse_version} > 1010 \|\| 0%{?opensuse_bs} +%if %suse_version > 1010 \|\| 0%{?opensuse_bs} # NSS version on 10.1 is too old %define has_system_nss 1 %endif -%define releasedate 2008110600 +%define releasedate 2009062200 %define apiversion 1.8.1 -%define uaweight 181180 +%define uaweight 181220 ### configuration end ### %define my_provides %{_tmppath}/my-provides %define my_requires %{_tmppath}/my-requires @@ -93,7 +93,7 @@ %package devel Summary: XULRunner/Gecko SDK 1.8.1.x Group: Development/Libraries/Other -%if 0%{?suse_version} > 1010 +%if %suse_version > 1010 Obsoletes: gecko-sdk # For upgrade from 10.2 betas: Obsoletes: mozilla-xulrunner180-devel @@ -119,7 +119,7 @@ Summary: Translations for XULRunner 1.8.1.x Group: Productivity/Other PreReq: %{name} = %{version} -%if 0%{?suse_version} > 1010 +%if %suse_version > 1010 # For upgrade from 10.2 betas: Obsoletes: mozilla-xulrunner180-l10n %endif @@ -151,7 +151,7 @@ %build %ifarch %x86 -%if 0%{?suse_version} <= 1010 +%if %suse_version <= 1010 export JAVA_HOME=/usr/lib/jvm/java-1.4.2-sun %endif %endif @@ -162,7 +162,7 @@ export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" -#%if 0%{?suse_version} > 1020 +#%if %suse_version > 1020 #export ac_cv_visibility_hidden="no" #%endif export RPATH="-Wl,-rpath -Wl,%{_libdir}/xulrunner-%{version}" @@ -283,7 +283,7 @@ %define __find_requires %{my_requires} %endif # fdupes -%if 0%{?suse_version} > 1020 +%if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version}/ %fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version}/ %endif @@ -311,9 +311,6 @@ /usr/sbin/update-alternatives --install %{_bindir}/xulrunner \ xulrunner %{_libdir}/xulrunner-%{version}/xulrunner %{uaweight} \|\| : %{_libdir}/xulrunner-%{version}/xulrunner --register-global \|\| : -mkdir -p /etc/ld.so.conf.d -echo "%{_libdir}/xulrunner-1.8.1" > /etc/ld.so.conf.d/mozilla-xulrunner181.conf -/sbin/ldconfig # needed for updates which transition directory to symlink %if 0%{?ga_version:1}