[seamonkey] drop version from install dirs. Use just /usr/{lib, lib64}/seamonkey , as it used now for firefox and
Dmitry Butskoy
buc at fedoraproject.org
Wed Oct 31 16:38:36 UTC 2012
commit d6a3d01cc09425f98e363d28c2c67f39dc6e4170
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Oct 31 20:37:17 2012 +0400
drop version from install dirs.
Use just /usr/{lib,lib64}/seamonkey , as it used now for firefox and thunderbird.
seamonkey.spec | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index d8a0fa7..d44aafe 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -16,7 +16,7 @@
%define _unpackaged_files_terminate_build 0
%define builddir %{_builddir}/%{name}-%{version}
-%define mozdir %{_libdir}/seamonkey-%{version}
+%define mozdir %{_libdir}/seamonkey
%define sources_subdir comm-release
%define seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
@@ -53,6 +53,7 @@ Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.13-jemalloc.patch
Patch21: seamonkey-2.12.1-nodecommit.patch
+Patch22: seamonkey-2.13-installdir.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?system_nss}
@@ -132,6 +133,8 @@ popd
%patch20 -p1 -b .jemalloc
%patch21 -p1 -b .nodecommit
+%patch22 -p2 -b .installdir
+
# fix obsoleted modifier in inspector
sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -356,7 +359,10 @@ fi
# install our seamonkey.sh file
rm -rf $RPM_BUILD_ROOT/usr/bin/seamonkey
-cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
+#cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
+# -e 's,LIBDIR,%{_libdir},g' > \
+# $RPM_BUILD_ROOT/usr/bin/seamonkey
+cat %{SOURCE3} | sed -e 's/-MOZILLA_VERSION//g' \
-e 's,LIBDIR,%{_libdir},g' > \
$RPM_BUILD_ROOT/usr/bin/seamonkey
@@ -469,7 +475,7 @@ fi
%changelog
-* Wed Oct 31 2012 Dmitry Butskoy <Dmitry at Butskoy.name>
+* Wed Oct 31 2012 Dmitry Butskoy <Dmitry at Butskoy.name>
- exclude ppc64 arch (hoping it is temporary, #866589)
- fix startup warnings (error console) for omni and inspector
- fix build langpacks
@@ -479,6 +485,8 @@ fi
- add patch for jemalloc for powerpc arches (#852698)
- add patch to avoid decommit memory on powerpc arches (#852698)
- some cleanups in spec file
+- drop version from install directories (follow the current firefox
+ and thunderbird way)
* Mon Oct 26 2012 Martin Stransky <stransky at redhat.com> 2.13.2-1
- Update to 2.13.2
More information about the scm-commits
mailing list