diff -r 9f8c32361c40 -r efe18be91213 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Feb 18 22:29:19 2012 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Tue Feb 21 20:53:29 2012 +0100 @@ -34,6 +34,7 @@ BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel BuildRequires: yasm BuildRequires: zip %if %suse_version > 1110 @@ -206,7 +207,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -#%patch5 -p1 +%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -224,10 +225,10 @@ %patch31 -p1 %patch32 -p1 %if %suse_version >= 1110 -#%patch33 -p1 +%patch33 -p1 %endif %if %suse_version >= 1140 -#%patch34 -p1 +%patch34 -p1 %endif %patch38 -p1 %patch39 -p1 @@ -240,11 +241,11 @@ TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + # -#kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) -#if test "$kdehelperversion" != %{kde_helper_version}; then -# echo fix kde helper version in the .spec file -# exit 1 -#fi +kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) +if test "$kdehelperversion" != %{kde_helper_version}; then + echo fix kde helper version in the .spec file + exit 1 +fi source %{SOURCE5} export MOZ_SOURCE_STAMP=$REV export SOURCE_REPO=$REPO