[xulrunner] Update to 5.0 - removed gre.conf stuff

Martin Stransky stransky at fedoraproject.org
Tue Aug 16 10:19:17 UTC 2011


commit 65d60136295156cf294d3fe54c54e2d39511cbf7
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Aug 16 12:18:47 2011 +0200

    Update to 5.0 - removed gre.conf stuff

 xulrunner.spec |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 96d3f8a..21ced17 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
@@ -203,7 +203,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
@@ -376,10 +376,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
@@ -425,8 +425,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


More information about the scm-commits mailing list