[xulrunner/f15] * Mon Oct 10 2011 Martin Stransky <stransky at redhat.com> 7.0.1-2 - Removed GRE stuff - Removed xulrun
Martin Stransky
stransky at fedoraproject.org
Mon Oct 10 14:53:39 UTC 2011
commit 740114b3e28f97236f81287befabf88bf97ed60e
Author: Martin Stransky <stransky at redhat.com>
Date: Mon Oct 10 16:53:29 2011 +0200
* Mon Oct 10 2011 Martin Stransky <stransky at redhat.com> 7.0.1-2
- Removed GRE stuff
- Removed xulrunner rpath (mozbz#686434)
xulrunner.spec | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 7f60f67..bd3caa5 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -17,7 +17,6 @@
%global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver}
%global tarballdir mozilla-release
-#%global gre_dir %{_sysconfdir}/gre.d
# crash reporter work only on x86/x86_64
%ifarch %{ix86} x86_64
@@ -26,13 +25,6 @@
%global enable_mozilla_crashreporter 0
%endif
-%if %{__isa_bits} == 32
-%global gre_conf_file gre.conf
-%endif
-%if %{__isa_bits} == 64
-%global gre_conf_file gre64.conf
-%endif
-
# The actual sqlite version (see #480989):
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
@@ -52,13 +44,13 @@
%global gecko_verrel %{expand:%%{version}}-%{pre_name}
%global pre_tag .%{pre_version}
%else
-%global gecko_verrel %{expand:%%{version}}-1
+%global gecko_verrel %{expand:%%{version}}
%endif
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 7.0.1
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -269,7 +261,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
%endif
-export LDFLAGS="-Wl,-rpath,%{mozappdir}"
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
# create debuginfo for crash-stats.mozilla.com
@@ -371,12 +362,6 @@ for i in *.so; do
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}
-
# Library path
LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d
LD_CONF_FILE=xulrunner-%{__isa_bits}.conf
@@ -421,8 +406,6 @@ fi
%files
%defattr(-,root,root,-)
%{_bindir}/xulrunner
-#%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
@@ -466,6 +449,10 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Oct 10 2011 Martin Stransky <stransky at redhat.com> 7.0.1-2
+- Removed GRE stuff
+- Removed xulrunner rpath (mozbz#686434)
+
* Fri Sep 30 2011 Jan Horak <jhorak at redhat.com> - 7.0.1-1
- Update to 7.0.1
More information about the scm-commits
mailing list