commit 8cdd20e45e86bcaa17c615a25a5c57d194c161cb
Author: Jan Palus <[email protected]>
Date: Sun Apr 16 01:42:02 2023 +0200
up to 1.3.3
- switched to tar.gz tarballs -- upstream confirmed on irc tar.xz
releases are discontinued
mujs-shared.patch | 57 +++++++++++++++++++++++++++++--------------------------
mujs.spec | 15 +++++++--------
2 files changed, 37 insertions(+), 35 deletions(-)
---
diff --git a/mujs.spec b/mujs.spec
index e6fd57e..43cb626 100644
--- a/mujs.spec
+++ b/mujs.spec
@@ -1,17 +1,15 @@
Summary: MuJS - lightweight, embeddable JavaScript interpreter in C
Summary(pl.UTF-8): MuJS - lekki, osadzalny interpreter JavaScriptu
napisany w C
Name: mujs
-Version: 1.3.2
+Version: 1.3.3
Release: 1
License: ISC
Group: Development/Languages
-Source0: https://www.mujs.com/downloads/%{name}-%{version}.tar.xz
-# Source0-md5: c2221592e7033fd32cc399e24ca44f18
+Source0: https://www.mujs.com/downloads/%{name}-%{version}.tar.gz
+# Source0-md5: ba876c5c3bff4ef988b405a148ec111e
Patch0: %{name}-shared.patch
URL: http://www.mujs.com/
BuildRequires: readline-devel
-BuildRequires: tar >= 1:1.22
-BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -51,12 +49,12 @@ Statyczna biblioteka MuJS.
%patch0 -p1
%build
-%{__make} -j1 default shared static \
+%{__make} -j1 release \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} %{rpmcppflags} -std=c99 -Wall -Wextra
-Wno-unused-parameter -Wunreachable-code" \
LDFLAGS="%{rpmldflags}" \
- libdir=%{_libdir} \
- libmujs=libmujs.so
+ OPTIM= \
+ libdir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
@@ -76,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS COPYING README
%attr(755,root,root) %{_bindir}/mujs
+%attr(755,root,root) %{_bindir}/mujs-pp
%attr(755,root,root) %{_libdir}/libmujs.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmujs.so.0
diff --git a/mujs-shared.patch b/mujs-shared.patch
index 128fdf1..2179578 100644
--- a/mujs-shared.patch
+++ b/mujs-shared.patch
@@ -1,30 +1,33 @@
---- mujs-1.2.0/Makefile.orig 2021-12-08 12:56:12.000000000 +0100
-+++ mujs-1.2.0/Makefile 2022-04-08 06:21:16.629112683 +0200
-@@ -88,15 +88,15 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
-
- $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
- @ mkdir -p $(@D)
-- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS)
-Wl,-soname,libmujs.so.0 -o $@ $< -lm
-
- libmujs ?= libmujs.a
-
--$(OUT)/mujs: $(OUT)/main.o $(OUT)/$(libmujs)
-+$(OUT)/mujs: $(OUT)/main.o $(OUT)/libmujs.$(SO_EXT)
- @ mkdir -p $(@D)
- $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) $(LIBREADLINE) -lm
-
--$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/$(libmujs)
-+$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/libmujs.$(SO_EXT)
- @ mkdir -p $(@D)
- $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) -lm
-
-@@ -124,7 +124,9 @@ install-static: install-common $(OUT)/li
- install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
-
- install-shared: install-common $(OUT)/libmujs.$(SO_EXT)
-- install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)
-+ install -m 755 $(OUT)/libmujs.$(SO_EXT)
$(DESTDIR)$(libdir)/libmujs.so.0.0.0
+--- mujs-1.3.3/Makefile.orig 2023-04-15 12:09:09.276756511 +0200
++++ mujs-1.3.3/Makefile 2023-04-15 12:22:41.608077963 +0200
+@@ -92,16 +92,16 @@
+
+ build/release/libmujs.$(SO): one.c $(SRCS) $(HDRS)
+ @mkdir -p $(@D)
+- $(CC) $(CFLAGS) $(OPTIM) -fPIC -shared -o $@ one.c -lm
++ $(CC) $(CFLAGS) $(OPTIM) -fPIC -shared $(LDFLAGS)
-Wl,-soname,libmujs.so.0 -o $@ one.c -lm
+ build/release/libmujs.o: one.c $(SRCS) $(HDRS)
+ @mkdir -p $(@D)
+ $(CC) $(CFLAGS) $(OPTIM) -c -o $@ one.c
+ build/release/libmujs.a: build/release/libmujs.o
+ $(AR) cr $@ $^
+-build/release/mujs: main.c build/release/libmujs.o
+- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline
+-build/release/mujs-pp: pp.c build/release/libmujs.o
+- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm
++build/release/mujs: main.c build/release/libmujs.$(SO)
++ $(CC) $(CFLAGS) $(OPTIM) $(LDFLAGS) -o $@ $^ -lm -DHAVE_READLINE
-lreadline
++build/release/mujs-pp: pp.c build/release/libmujs.$(SO)
++ $(CC) $(CFLAGS) $(OPTIM) $(LDFLAGS) -o $@ $^ -lm
+
+ build/release/mujs.pc:
+ @mkdir -p $(@D)
+@@ -126,7 +126,9 @@
+ install -m 644 build/release/libmujs.a $(DESTDIR)$(libdir)
+
+ install-shared: install-common build/release/libmujs.$(SO)
+- install -m 755 build/release/libmujs.$(SO) $(DESTDIR)$(libdir)
++ install -m 755 build/release/libmujs.$(SO)
$(DESTDIR)$(libdir)/libmujs.so.0.0.0
+ ln -s libmujs.so.0.0.0 $(DESTDIR)$(libdir)/libmujs.so.0
+ ln -s libmujs.so.0.0.0 $(DESTDIR)$(libdir)/libmujs.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mujs.git/commitdiff/8cdd20e45e86bcaa17c615a25a5c57d194c161cb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
