Author: patrys Date: Fri Jul 29 16:33:24 2011 GMT Module: packages Tag: DEVEL ---- Log message: - 1.29.15 - left introspection data unpackaged (install rule seems bogus)
---- Files affected: packages/gjs: gjs-rpath.patch (1.1 -> 1.1.2.1) , gjs.spec (1.25 -> 1.25.2.1) ---- Diffs: ================================================================ Index: packages/gjs/gjs-rpath.patch diff -u packages/gjs/gjs-rpath.patch:1.1 packages/gjs/gjs-rpath.patch:1.1.2.1 --- packages/gjs/gjs-rpath.patch:1.1 Fri Oct 15 07:14:38 2010 +++ packages/gjs/gjs-rpath.patch Fri Jul 29 18:33:19 2011 @@ -7,27 +7,15 @@ - ## Ubuntu does not set libdir in mozilla-js.pc + ## PLD does not set libdir in mozilla-js.pc - if test x"$FIREFOX_JS_LIBDIR" = x ; then -- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the -+ ## PLD returns xulrunner-devel as the sdkdir, but for the - ## libdir we want the runtime location on the target system, - ## so can't use -devel. - ## The library is in the non-devel directory also. - ## Don't ask me why it's in two places. -- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` -+ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-sdk//g'` - - if ! test -d "$FIREFOX_JS_LIBDIR" ; then - FIREFOX_JS_LIBDIR= -diff -ur gjs-0.7.4-o//Makefile-gi.am gjs-0.7.4/Makefile-gi.am ---- gjs-0.7.4-o//Makefile-gi.am 2010-09-17 06:49:48.000000000 -0600 -+++ gjs-0.7.4/Makefile-gi.am 2010-10-14 23:06:07.000000000 -0600 -@@ -10,7 +10,7 @@ - libgjs.la \ - $(GJS_GI_LIBS) - libgjs_gi_la_LDFLAGS = \ -- -export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic -no-undefined -+ -export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic -no-undefined -R $(FIREFOX_JS_LIBDIR) - - nobase_gjsgiinclude_HEADERS = \ - gi/arg.h \ + if test x"$FIREFOX_JS_LIBDIR" = x; then +- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the ++ ## PLD returns xulrunner-devel as the sdkdir, but for the + ## libdir we want the runtime location on the target system, + ## so can't use -devel. + ## The library is in the non-devel directory also. + ## Don't ask me why it's in two places. +- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` ++ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-sdk//g'` + if ! test -d "$FIREFOX_JS_LIBDIR"; then + FIREFOX_JS_LIBDIR= + fi ================================================================ Index: packages/gjs/gjs.spec diff -u packages/gjs/gjs.spec:1.25 packages/gjs/gjs.spec:1.25.2.1 --- packages/gjs/gjs.spec:1.25 Sat Jul 23 20:52:20 2011 +++ packages/gjs/gjs.spec Fri Jul 29 18:33:19 2011 @@ -2,14 +2,13 @@ Summary: JavaScript bindings for GNOME Summary(pl.UTF-8): Wiązania JavaScript dla GNOME Name: gjs -Version: 0.7.14 -Release: 5 +Version: 1.29.15 +Release: 1 License: MIT and (MPL v1.1 / GPL v2+ / LGPL v2+) Group: Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/gjs/0.7/%{name}-%{version}.tar.bz2 -# Source0-md5: 0e1487e066df8937317da34545f7b548 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gjs/1.29/%{name}-%{version}.tar.bz2 +# Source0-md5: 01aa4dfb422975d22a031295b9cbc299 Patch0: %{name}-rpath.patch -Patch1: %{name}-xulrunner-5.0.patch URL: http://live.gnome.org/Gjs BuildRequires: autoconf >= 2.61 BuildRequires: automake @@ -18,7 +17,7 @@ BuildRequires: dbus-glib-devel BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.18.0 -BuildRequires: gobject-introspection-devel >= 0.10.1 +BuildRequires: gobject-introspection-devel >= 1.29.16 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -43,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: glib2-devel >= 1:2.16.0 -Requires: gobject-introspection-devel >= 0.9.5 +Requires: gobject-introspection-devel >= 1.29.16 Requires: xulrunner-devel %description devel @@ -55,7 +54,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -64,7 +62,8 @@ %{__autoheader} %{__automake} %configure \ - --disable-silent-rules + --disable-silent-rules \ + --enable-introspection %{__make} %install @@ -92,8 +91,8 @@ %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-gi.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgjs-gi.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-1.0 @@ -102,7 +101,6 @@ %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/gi.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 @@ -110,12 +108,11 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgjs-dbus.so -%attr(755,root,root) %{_libdir}/libgjs-gi.so +%attr(755,root,root) %{_libdir}/libgjs-gdbus.so %attr(755,root,root) %{_libdir}/libgjs.so %{_includedir}/gjs-1.0 %{_pkgconfigdir}/gjs-1.0.pc %{_pkgconfigdir}/gjs-dbus-1.0.pc -%{_pkgconfigdir}/gjs-gi-1.0.pc %{_pkgconfigdir}/gjs-internals-1.0.pc %{_examplesdir}/%{name}-%{version} @@ -125,6 +122,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25.2.1 2011/07/29 16:33:19 patrys +- 1.29.15 +- left introspection data unpackaged (install rule seems bogus) + Revision 1.25 2011/07/23 18:52:20 megabajt - release 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gjs/gjs-rpath.patch?r1=1.1&r2=1.1.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gjs/gjs.spec?r1=1.25&r2=1.25.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
