- updated to 1.42.0

[packages/gjs.git] / gjs.spec

diff --git a/gjs.spec b/gjs.spec
index 99f0e67752f21ddb5cdb3ee2ffda692f99f8333e..b0dcdcb603b2a05e4aa8a79d7d3781b546fd117a 100644 (file)
--- a/gjs.spec
+++ b/gjs.spec
@@ -1,30 +1,34 @@
+#
+# Conditional build:
+%bcond_without systemtap       # systemtap/dtrace trace support
+#
 Summary:       JavaScript bindings for GNOME
-Summary(pl.UTF-8):     Wiązania JavaScript dla GNOME
+Summary(pl.UTF-8):     Wiązania JavaScriptu dla GNOME
 Name:          gjs
-Version:       1.30.0
-Release:       9
-License:       MIT and (MPL v1.1 / GPL v2+ / LGPL v2+)
+Version:       1.42.0
+Release:       1
+License:       MIT and (MPL v1.1 or GPL v2+ or LGPL v2+)
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gjs/1.30/%{name}-%{version}.tar.xz
-# Source0-md5: 908c1c8654d141d64aac07d57de9a457
-Patch0:                %{name}-rpath.patch
-Patch1:                am.patch
-Patch2:                jsval.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gjs/1.42/%{name}-%{version}.tar.xz
+# Source0-md5: a30ff5e3e13498c4d3c95d2555751c4d
+Patch0:                %{name}-systemtap.patch
 URL:           http://live.gnome.org/Gjs
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 BuildRequires: cairo-devel
 BuildRequires: cairo-gobject-devel
-BuildRequires: dbus-glib-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.18.0
-BuildRequires: gobject-introspection-devel >= 1.29.17
+BuildRequires: glib2-devel >= 1:2.36.0
+BuildRequires: gobject-introspection-devel >= 1.41.4
+BuildRequires: gtk+3-devel
+BuildRequires: libffi-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: mozjs24-devel
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
-BuildRequires: xulrunner-devel >= 1.9.2
-%requires_eq   xulrunner-libs
+%{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
+Requires:      glib2 >= 1:2.36.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,8 +37,8 @@ on Spidermonkey JavaScript engine and the GObject introspection
 framework.
 
 %description -l pl.UTF-8
-Gjs pozwala używać bibliotek GNOME z JavaScript. Bazuje głównie na
-silniku JavaScript Spidermonkey i systemie GObject introspection.
+Gjs pozwala używać bibliotek GNOME z JavaScriptem. Jest oparty głównie
+na silniku JavaScriptu Spidermonkey i systemie GObject introspection.
 
 %package devel
 Summary:       Header files for gjs library
@@ -42,9 +46,9 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki gjs
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      dbus-devel
-Requires:      glib2-devel >= 1:2.18.0
-Requires:      gobject-introspection-devel >= 1.29.17
-Requires:      xulrunner-devel
+Requires:      glib2-devel >= 1:2.36.0
+Requires:      gobject-introspection-devel >= 1.41.4
+Requires:      mozjs24-devel
 
 %description devel
 Header files for gjs library.
@@ -52,11 +56,22 @@ Header files for gjs library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki gjs.
 
+%package -n systemtap-gjs
+Summary:       systemtap/dtrace probes for gjs
+Summary(pl.UTF-8):     Sondy systemtap/dtrace dla gjs
+Group:         Development/Tools
+Requires:      %{name} = %{version}-%{release}
+Requires:      systemtap-client
+
+%description -n systemtap-gjs
+systemtap/dtrace probes for gjs.
+
+%description -n systemtap-gjs -l pl.UTF-8
+Sondy systemtap/dtrace dla gjs.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -65,20 +80,20 @@ Pliki nagłówkowe biblioteki gjs.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       %{?with_systemtap:--enable-systemtap}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_datadir}/gir-1.0,%{_libdir}/girepository-1.0}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 cp examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gjs-1.0/*.la \
-       $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,32 +106,20 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING NEWS README
 %attr(755,root,root) %{_bindir}/gjs
 %attr(755,root,root) %{_bindir}/gjs-console
-%attr(755,root,root) %{_libdir}/libgjs-dbus.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgjs-dbus.so.0
-%attr(755,root,root) %{_libdir}/libgjs-gdbus.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgjs-gdbus.so.0
 %attr(755,root,root) %{_libdir}/libgjs.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgjs.so.0
 %dir %{_libdir}/gjs
-%{_libdir}/gjs/*.typelib
-%dir %{_libdir}/gjs-1.0
-%attr(755,root,root) %{_libdir}/gjs-1.0/cairoNative.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/console.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/dbusNative.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/debugger.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/gettextNative.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/langNative.so
-%attr(755,root,root) %{_libdir}/gjs-1.0/mainloop.so
-%{_datadir}/gjs-1.0
+%dir %{_libdir}/gjs/girepository-1.0
+%{_libdir}/gjs/girepository-1.0/GjsPrivate-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgjs-dbus.so
-%attr(755,root,root) %{_libdir}/libgjs-gdbus.so
 %attr(755,root,root) %{_libdir}/libgjs.so
-%{_libdir}/gjs/*.gir
 %{_includedir}/gjs-1.0
 %{_pkgconfigdir}/gjs-1.0.pc
-%{_pkgconfigdir}/gjs-dbus-1.0.pc
 %{_pkgconfigdir}/gjs-internals-1.0.pc
 %{_examplesdir}/%{name}-%{version}
+
+%files -n systemtap-gjs
+%defattr(644,root,root,755)
+%{_datadir}/systemtap/tapset/gjs.stp