Hello community,
here is the log from the commit of package mozjs38 for openSUSE:Factory checked
in at 2016-08-24 10:08:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozjs38 (Old)
and /work/SRC/openSUSE:Factory/.mozjs38.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozjs38"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozjs38/mozjs38.changes 2016-08-03
11:44:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozjs38.new/mozjs38.changes 2016-08-24
10:09:08.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 22 16:26:18 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- devel package should not symlink to build directory boo#992065
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozjs38.spec ++++++
--- /var/tmp/diff_new_pack.u7dHCy/_old 2016-08-24 10:09:10.000000000 +0200
+++ /var/tmp/diff_new_pack.u7dHCy/_new 2016-08-24 10:09:10.000000000 +0200
@@ -17,17 +17,17 @@
#
+%global pre_release .rc0
+%global major 38
+
Name: mozjs38
Summary: JavaScript interpreter
License: MPL-2.0
Group: System/Libraries
-#ersion: 38.2.1
-Version: 38.0.0
-Release: rc0
+Version: %{major}.2.1
+Release: 8%{?dist}
Url: http://www.mozilla.org/js/
-# TODO: warning still a beta version
-Source0: https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2
-#ource0: http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-38.2.1.tar.bz2
+Source0:
https://people.mozilla.org/~sstangl/mozjs-%{version}%{pre_release}.tar.bz2
Source1: baselibs.conf
Patch1: mozjs38_missing_zlib_moz_build.patch
Patch2: mozjs38_missing_python_before_milestone_call.patch
@@ -49,11 +49,11 @@
superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
with only mild differences from the published standard.
-%package -n libmozjs-38
+%package -n libmozjs-%{major}
Summary: JavaScript library
Group: System/Libraries
-%description -n libmozjs-38
+%description -n libmozjs-%{major}
JavaScript is the Netscape-developed object scripting language used in millions
of web pages and server applications worldwide. Netscape's JavaScript is a
superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
@@ -62,7 +62,7 @@
%package devel
Summary: Header files, libraries and development documentation for
%{name}
Group: Development/Libraries/Other
-Requires: libmozjs-38 = %{version}-%{release}
+Requires: libmozjs-%{major} = %{version}-%{release}
Requires: pkg-config
%description devel
@@ -71,12 +71,15 @@
you will need to install %{name}-devel.
%prep
-%setup -q -n mozjs-%{version}
+%setup -q -n mozjs-%{major}.0.0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
+# Remove zlib directory (to be sure using system version)
+rm -rf ../../modules/zlib
+
%build
# no need to add build time to binaries
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -97,29 +100,39 @@
# delete js-config since everything should use the pkg-config file
rm -f %{buildroot}%{_bindir}/js-config
# headers are installed with executable permissions
-find %{buildroot}%{_includedir}/mozjs-38/ -type f -print | xargs chmod 644
+find %{buildroot}%{_includedir}/mozjs-%{major}/ -type f -print | xargs chmod
644
chmod 644 %{buildroot}%{_libdir}/pkgconfig/*
+# Install files, not symlinks to build directory
+pushd %{buildroot}%{_includedir}
+ for link in `find . -type l`; do
+ header=`readlink $link`
+ rm -f $link
+ cp -p $header $link
+ done
+popd
+cp -p js/src/js-config.h %{buildroot}%{_includedir}/mozjs-%{major}
+
%clean
%{__rm} -rf %{buildroot}
-%post -n libmozjs-38 -p /sbin/ldconfig
+%post -n libmozjs-%{major} -p /sbin/ldconfig
-%postun -n libmozjs-38 -p /sbin/ldconfig
+%postun -n libmozjs-%{major} -p /sbin/ldconfig
-# TODO /usr/bin/js and not /usr/bin/js38 that differ from previous js24
%files
+# TODO /usr/bin/js and not /usr/bin/js38 that differ from previous js24
%defattr(-,root,root,-)
%doc js/src/README.html LICENSE
%{_bindir}/js
-%files -n libmozjs-38
+%files -n libmozjs-%{major}
%defattr(-,root,root,-)
%{_libdir}/*.so
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
-%{_includedir}/mozjs-38
+%{_includedir}/mozjs-%{major}
%changelog
