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-gdk3.patch b/seed-gdk3.patch deleted file mode 100644 index fcafd24..0000000 --- a/seed-gdk3.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up seed-2.31.5/configure.ac.gdk3 seed-2.31.5/configure.ac ---- seed-2.31.5/configure.ac.gdk3 2010-07-12 02:04:34.000000000 -0400 -+++ seed-2.31.5/configure.ac 2010-07-15 21:13:07.214356999 -0400 -@@ -98,7 +98,7 @@ if test x"$want_canvas_module" == x"yes" - PKG_CHECK_MODULES(CAIRO, cairo) - AC_SUBST(CAIRO_CFLAGS) - AC_SUBST(CAIRO_LDFLAGS) -- PKG_CHECK_MODULES(GDK, gdk-2.0) -+ PKG_CHECK_MODULES(GDK, gdk-3.0) - AC_SUBST(GDK_CFLAGS) - AC_SUBST(GDK_LDFLAGS) - fi -@@ -225,7 +225,7 @@ AC_ARG_ENABLE(gtkbuilder-module, - [want_gtkbuilder_module=$enableval],[want_gtkbuilder_module="yes"]) - - if test x"$want_gtkbuilder_module" == x"yes" ; then -- PKG_CHECK_MODULES(GTK, gtk+-2.0) -+ PKG_CHECK_MODULES(GTK, gtk+-3.0) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LDFLAGS) - fi diff --git a/seed-libs.patch b/seed-libs.patch deleted file mode 100644 index acca0a5..0000000 --- a/seed-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- seed-2.31.5/src/Makefile.am 2010-07-10 02:52:41.000000000 -0400 -+++ hacked/src/Makefile.am 2010-07-15 00:04:59.194956004 -0400 -@@ -23,4 +23,6 @@ - $(WEBKIT_LDFLAGS) - - seed_LDADD = \ -- ../libseed/libseed.la -+ ../libseed/libseed.la \ -+ $(GOBJECT_INTROSPECTION_LIBS) \ -+ $(WEBKIT_LIBS) diff --git a/seed.spec b/seed.spec index 958c031..71395fd 100644 --- a/seed.spec +++ b/seed.spec @@ -1,6 +1,6 @@ Name: seed Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME JavaScript interpreter Group: Development/Languages @@ -8,6 +8,8 @@ License: LGPLv3+ URL: http://live.gnome.org/Seed Source0: http://ftp.gnome.org/pub/gnome/sources/seed/3.0/seed-%{version}.tar.bz2 Source1: README.Fedora +# Seed.js multilib fix +Patch0: seed-3.0.0-multilib.patch BuildRequires: dbus-glib-devel BuildRequires: gobject-introspection-devel @@ -23,10 +25,7 @@ BuildRequires: webkitgtk-devel %endif BuildRequires: gtk-doc -#Patch0: seed-libs.patch -#Patch1: seed-gdk3.patch - -BuildRequires: automake autoconf libtool +#BuildRequires: automake autoconf libtool Requires: gnome-js-common %description @@ -51,7 +50,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 @@ -60,14 +58,11 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .multilib cp -p %{SOURCE1} . -#%patch0 -p1 -b .libs -#%if 0%{?fedora} > 14 -#%patch1 -p1 -b .gdk3 -#%endif -mkdir m4 -autoreconf -i -f +#mkdir m4 +#autoreconf -i -f # add lib64 to dlsearch_path_spec sed -i.libdir_syssearch -e \ @@ -76,6 +71,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} && @@ -129,10 +125,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 - 3.0.0-2 +- Multilib fix: Seed.js now searches both lib64 and lib directories +- Documentation subpackage no longer depends on gtk-doc (# 707571) + * Sun Apr 3 2011 Christopher Aillon - 3.0.0-1 - Update to 3.0.0