diff --git a/xulrunner.spec b/xulrunner.spec index 7b776f0..191be32 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -17,7 +17,7 @@ %global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver} %global tarballdir mozilla-release -%global gre_dir %{_sysconfdir}/gre.d +#%global gre_dir %{_sysconfdir}/gre.d # crash reporter work only on x86/x86_64 %ifarch %{ix86} x86_64 @@ -74,7 +74,7 @@ Patch0: xulrunner-version.patch Patch1: mozilla-build.patch Patch9: mozilla-build-sbrk.patch Patch14: xulrunner-2.0-chromium-types.patch -Patch15: firefox-6.0-xulstub.patch +#Patch15: firefox-6.0-xulstub.patch %if 0%{?fedora} <= 15 Patch16: add-gtkmozembed.patch %endif @@ -204,7 +204,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \ %patch1 -p2 -b .build %patch9 -p2 -b .sbrk %patch14 -p1 -b .chromium-types -%patch15 -p2 -b .xulstub +#%patch15 -p2 -b .xulstub %if 0%{?fedora} <= 15 %patch16 -p2 -b .gtkmozembed %endif @@ -378,10 +378,10 @@ done popd # GRE stuff -MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` -%{__mv} $RPM_BUILD_ROOT%{gre_dir}/$MOZILLA_GECKO_VERSION".system.conf" \ - $RPM_BUILD_ROOT%{gre_dir}/%{gre_conf_file} -chmod 644 $RPM_BUILD_ROOT%{gre_dir}/%{gre_conf_file} +#MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` +#%{__mv} $RPM_BUILD_ROOT%{gre_dir}/$MOZILLA_GECKO_VERSION".system.conf" \ +# $RPM_BUILD_ROOT%{gre_dir}/%{gre_conf_file} +#chmod 644 $RPM_BUILD_ROOT%{gre_dir}/%{gre_conf_file} # Library path LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d @@ -427,8 +427,8 @@ fi %files %defattr(-,root,root,-) %{_bindir}/xulrunner -%dir %{_sysconfdir}/gre.d -%{_sysconfdir}/gre.d/gre*.conf +#%dir %{_sysconfdir}/gre.d +#%{_sysconfdir}/gre.d/gre*.conf %dir %{mozappdir} %doc %attr(644, root, root) %{mozappdir}/LICENSE %doc %attr(644, root, root) %{mozappdir}/README.txt