[seed] Multilib fix: Seed.js now searches both lib64 and lib directories Documentation subpackage no longer
Michel Alexandre Salim
salimma at fedoraproject.org
Mon Aug 8 11:20:19 UTC 2011
commit 2a78f6191fd880b95aa98b85001304e8304c6bdf
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sun Aug 7 23:50:14 2011 +0200
Multilib fix: Seed.js now searches both lib64 and lib directories
Documentation subpackage no longer depends on gtk-doc (# 707571)
seed-3.0.0-multilib.patch | 31 +++++++++++++++++++++++++++++++
seed.spec | 18 ++++++++++++++++--
2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/seed-3.0.0-multilib.patch b/seed-3.0.0-multilib.patch
new file mode 100644
index 0000000..086480b
--- /dev/null
+++ b/seed-3.0.0-multilib.patch
@@ -0,0 +1,31 @@
+--- seed-3.0.0/extensions/Seed.js.in.multilib 2011-02-22 23:44:01.000000000 +0100
++++ seed-3.0.0/extensions/Seed.js.in 2011-08-07 23:22:09.249981721 +0200
+@@ -174,6 +174,7 @@
+ if(!imports.searchPath || (imports.searchPath.length == 0))
+ {
+ imports.searchPath = [ "%gnomejsdir%",
++ "%pkglib64dir%",
+ "%pkglibdir%",
+ "%pkgdatadir%",
+ "/usr/local/lib/seed",
+--- seed-3.0.0/extensions/Makefile.in.multilib 2011-04-02 04:58:19.000000000 +0200
++++ seed-3.0.0/extensions/Makefile.in 2011-08-07 23:25:36.180525310 +0200
+@@ -18,7 +18,8 @@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglib64dir = $(prefix)/lib64/@PACKAGE@
++pkglibdir = $(prefix)/lib/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -510,7 +511,7 @@
+
+
+ Seed.js: Seed.js.in
+- $(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
++ $(AM_V_GEN) $(SED) -e "s|%pkglib64dir%|$(pkglib64dir)@SEED_GTK_VERSION@|" -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/seed.spec b/seed.spec
index b07f087..4056155 100644
--- a/seed.spec
+++ b/seed.spec
@@ -1,12 +1,18 @@
Name: seed
Version: 3.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNOME JavaScript interpreter
Group: Development/Languages
License: LGPLv3+
URL: http://live.gnome.org/Seed
Source0: http://ftp.gnome.org/pub/gnome/sources/seed/3.1/seed-%{version}.tar.bz2
+# Seed.js multilib fix
+Patch0: seed-3.0.0-multilib.patch
+# ParamSpec hack:
+# https://bugzilla.gnome.org/show_bug.cgi?id=652771
+# https://bugzilla.gnome.org/show_bug.cgi?id=653077
+Patch1: seed-3.1.1-paramspec.patch
BuildRequires: intltool
BuildRequires: mpfr-devel
@@ -43,7 +49,6 @@ Summary: Documentation files for %{name}
Group: Documentation
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
-Requires: gtk-doc
%description doc
The %{name}-doc package contains documentation for
@@ -52,6 +57,8 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b .multilib
+%patch1 -p1 -b .paramspec
# add lib64 to dlsearch_path_spec
sed -i.libdir_syssearch -e \
@@ -60,6 +67,7 @@ sed -i.libdir_syssearch -e \
sed -i.cflags -e \
's|^\([ \t][ \t]*\)CFLAGS=\"[^\$].*$|\1true|' \
configure
+
# remove unneeded shebang
(cd extensions &&
touch -r repl.js{,.timestamp} &&
@@ -118,10 +126,16 @@ rm devdocs/{AUTHORS,COPYING,INSTALL,README}
%files doc
%defattr(-,root,root,-)
%doc devdocs/*
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/seed
%changelog
+* Sun Aug 7 2011 Michel Salim <salimma at fedoraproject.org> - 3.1.1-2
+- Multilib fix: Seed.js now searches both lib64 and lib directories
+- Documentation subpackage no longer depends on gtk-doc (# 707571)
+
* Sun Jul 31 2011 Michel Salim <salimma at fedoraproject.org> - 3.1.1-1
- Update to 3.1.1
More information about the scm-commits
mailing list