Browse Source

xulrunner 2.0 でビルドできないため、無効にした。

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4615 ec354946-7b23-47d6-9f5a-488ba84defc7
yasumichi 12 years ago
parent
commit
d60e8ce834
1 changed files with 14 additions and 9 deletions
  1. 14 9
      g/google-gadgets/google-gadgets-vl.spec

+ 14 - 9
g/google-gadgets/google-gadgets-vl.spec

@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Summary:        Google Gadgets platform for Linux
 Version:        0.11.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          User Interface/Desktops
 License:        ASL 2.0
@@ -17,11 +17,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  curl-devel libxml2-devel zlib-devel libtool-ltdl-devel
 # still needed even if we're not buliding gtkmoz element, for JavaScript
-%if %{?_dist_release} == "vl5"
-BuildRequires:  xulrunner-devel-unstable
-%else
-BuildRequires:  xulrunner-devel
-%endif
+#%%if %{?_dist_release} == "vl5"
+#BuildRequires:  xulrunner-devel-unstable
+#%%else
+#BuildRequires:  xulrunner-devel
+#%%endif
 BuildRequires:  WebKit-gtk-devel 
 BuildRequires:  dbus-devel gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires:  cairo-devel gtk2-devel librsvg2-devel
@@ -93,7 +93,8 @@ done
 #ln -s %{_datadir}/automake-*/mkinstalldirs libltdl/
 
 %configure --disable-static \
-           --with-browser-plugins-dir=%{_libdir}/mozilla/plugins
+           --with-browser-plugins-dir=%{_libdir}/mozilla/plugins \
+           --disable-gtkmoz-browser-element --disable-smjs-script-runtime
 
 # Rpath fix by Mamoru Tasaka
 # we don't want to obliterate all RPATHs, since it is used during build
@@ -170,7 +171,7 @@ update-desktop-database &> /dev/null || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/google-gadgets
-%exclude %{_libdir}/google-gadgets/gtkmoz-browser-child
+#%%exclude %{_libdir}/google-gadgets/gtkmoz-browser-child
 %exclude %{_libdir}/google-gadgets/modules/gtk*.so
 %exclude %{_libdir}/google-gadgets/modules/qt*.so
 %exclude %{_libdir}/google-gadgets/include
@@ -185,7 +186,7 @@ update-desktop-database &> /dev/null || :
 %defattr(-,root,root,-)
 %{_bindir}/ggl-gtk
 %{_libdir}/libggadget-gtk*.so.*
-%{_libdir}/google-gadgets/gtkmoz-browser-child
+#%%{_libdir}/google-gadgets/gtkmoz-browser-child
 %{_libdir}/google-gadgets/modules/gtk*.so
 %{_datadir}/applications/*gtk.desktop
 %{_datadir}/applications/*designer.desktop
@@ -206,6 +207,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Aug 18 2011 Yasumichi Akahoshi <yasumichi@vinelinux.org> 0.11.2-2
+- not work with xulrunner 2.0, remove from BR.
+- add --disable-gtkmoz-browser-element , --disable-smjs-script-runtime
+
 * Thu Sep 30 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.11.2-1
 - new upstream release
 - built with rpm-4.8.1 for pkg-config