Hello community,

here is the log from the commit of package js for openSUSE:Factory
checked in at Fri Jun 17 13:00:13 CEST 2011.



--------
--- js/js.changes       2011-04-19 16:51:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/js/js.changes  2011-06-17 09:48:39.000000000 
+0200
@@ -1,0 +2,12 @@
+Fri Jun 17 09:40:46 CEST 2011 - [email protected]
+
+- Pass --enable-threadsafe to configure, as gjs relies on this.
+
+-------------------------------------------------------------------
+Fri Jun 17 06:46:44 UTC 2011 - [email protected]
+
+- create package by using "make install"
+- use upstream pkg-config file (libjs -> mozjs185)
+- avoid __DATE__ and __TIME__ in binaries
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ js.spec ++++++
--- /var/tmp/diff_new_pack.1VPVzO/_old  2011-06-17 12:58:49.000000000 +0200
+++ /var/tmp/diff_new_pack.1VPVzO/_new  2011-06-17 12:58:49.000000000 +0200
@@ -20,7 +20,7 @@
 Name:           js
 Summary:        JavaScript interpreter
 Version:        1.8.5
-Release:        1
+Release:        3
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Development/Languages/Other
 Url:            http://www.mozilla.org/js/
@@ -61,27 +61,19 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-cd js
-# Create pkgconfig file
-%{__cat} > libjs.pc << 'EOF'
-prefix=%{_prefix}
-exec_prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
-
-Name: libjs
-Description: JS library
-Requires: nspr
-Version: %{version}
-Libs: -L${libdir} -ljs
-Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
-EOF
 
 %build
+# no need to add build time to binaries
+modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
+DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
+TIME="\"$(date -d "${modified}" "+%%R")\""
+find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i 
"s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
+#
 export SUSE_ASNEEDED=0
+export MOZILLA_VERSION=%{version}
 cd js
 pushd src
-%configure --with-system-nspr
+%configure --with-system-nspr --enable-threadsafe
 popd
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src \
@@ -90,20 +82,18 @@
        BUILD_OPT="1" \
 
 %install
-cd js
-%{__mkdir_p} %{buildroot}%{_bindir} \
-            %{buildroot}%{_libdir}/pkgconfig \
-            %{buildroot}%{_includedir}
-%{__install} -m 0755 src/jscpucfg src/shell/js \
-       %{buildroot}%{_bindir}/
-%{__install} -m 0755 src/libmozjs185.so \
-        %{buildroot}%{_libdir}/
-%{__mv} %{buildroot}%{_libdir}/libmozjs185.so 
%{buildroot}%{_libdir}/libmozjs185.so.1.0
-ln -s libmozjs185.so.1.0 %{buildroot}%{_libdir}/libmozjs185.so
-%{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-        %{buildroot}%{_includedir}/
-%{__install} -m 0644 libjs.pc \
-        %{buildroot}%{_libdir}/pkgconfig/
+cd js/src
+%{makeinstall}
+%{__rm} -rf %{buildroot}%{_libdir}/libmozjs185-1.0.a
+# SO links are created wrong, fixing them
+%{__rm} -rf %{buildroot}%{_libdir}/libmozjs185.so.1.0
+%{__rm} -rf %{buildroot}%{_libdir}/libmozjs185.so
+%{__ln_s} libmozjs185.so.1.0.0 %{buildroot}%{_libdir}/libmozjs185.so.1.0
+%{__ln_s} libmozjs185.so.1.0.0 %{buildroot}%{_libdir}/libmozjs185.so
+# JS shell
+%{__install} -m 0755 shell/js %{buildroot}%{_bindir}/
+# headers are installed with executable permissions
+chmod 644 %{buildroot}%{_includedir}/js/*
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -123,11 +113,10 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/jscpucfg
+#%{_bindir}/jscpucfg
+%{_bindir}/js-config
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
-%{_includedir}/js*.h
-%{_includedir}/*.tbl
-%{_includedir}/js.msg
+%{_includedir}/js/
 
 %changelog


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to