Seed

1 files changed, 27 insertions, 15 deletions

diff --git a/gnome/seed.spec b/gnome/seed.spec
index 829fd38..a19424f 100644
--- a/gnome/seed.spec
+++ b/gnome/seed.spec
@@ -1,6 +1,6 @@
 Name:           seed
 Version:        2.30.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME JavaScript interpreter
 
 Group:          Development/Languages
@@ -8,16 +8,16 @@ License:        LGPLv3+
 URL:            http://live.gnome.org/Seed
 Source0:        http://ftp.gnome.org/pub/gnome/sources/seed/2.30/seed-%{version}.tar.bz2
 Patch0:         seed-2.30.0-fix-implicit-dso.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  dbus-glib-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gnome-js-common-devel
-BuildRequires:  webkitgtk-devel
-BuildRequires:  readline-devel
+BuildRequires:  intltool
 BuildRequires:  mpfr-devel
+BuildRequires:  readline-devel
 BuildRequires:  sqlite-devel
+BuildRequires:  webkitgtk-devel
 BuildRequires:  gtk-doc
-BuildRequires:  chrpath
 Requires:       gnome-js-common
 
 %description
@@ -40,6 +40,7 @@ developing applications that use %{name}.
 %package        doc
 Summary:        Documentation files for %{name}
 Group:          Documentation
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk-doc
 
@@ -51,32 +52,38 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .fix-implicit-dso
+# add lib64 to dlsearch_path_spec
+sed -i.libdir_syssearch -e \
+  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
+  configure
+sed -i.cflags -e \
+  's|^\([ \t][ \t]*\)CFLAGS=\"[^\$].*$|\1true|' \
+  configure
+# remove unneeded shebang
+(cd extensions &&
+    touch -r repl.js{,.timestamp} &&
+    sed -i '1,2d' repl.js &&
+    touch -r repl.js{.timestamp,} &&
+    rm repl.js.timestamp)
 
 
 %build
 %configure
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-# remove hard-coded rpath
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/seed
-
 # grab developer docs
 mv $RPM_BUILD_ROOT%{_docdir}/seed devdocs
 # remove files already bundled with main package
 rm devdocs/{AUTHORS,COPYING,INSTALL,README}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -100,9 +107,14 @@ rm -rf $RPM_BUILD_ROOT
 %files doc
 %defattr(-,root,root,-)
 %doc devdocs/*
-%doc %{_datadir}/gtk-doc/html/seed
+%{_datadir}/gtk-doc/html/seed
 
 
 %changelog
+* Fri Jun 18 2010 Michel Salim <salimma@fedoraproject.org> - 2.30.0-2
+- Incorporate review recommendations (bz #600638)
+- Remove unneeded shebang in repl.js
+- Make -doc noarch
+
 * Mon Mar 29 2010 Michel Salim <salimma@fedoraproject.org> - 2.30.0-1
 - Initial package