OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jun-2006 10:00:36
Branch: HEAD Handle: 2006061909003500
Modified files:
openpkg-src/asymptote asymptote.patch asymptote.spec
Log:
upgrade and band-aid Bash constructs in installation procedure by
providing Bash
Summary:
Revision Changes Path
1.3 +10 -10 openpkg-src/asymptote/asymptote.patch
1.7 +3 -2 openpkg-src/asymptote/asymptote.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asymptote/asymptote.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 asymptote.patch
--- openpkg-src/asymptote/asymptote.patch 25 Apr 2006 18:13:18 -0000
1.2
+++ openpkg-src/asymptote/asymptote.patch 19 Jun 2006 08:00:35 -0000
1.3
@@ -1,9 +1,9 @@
Index: Makefile.in
---- Makefile.in.orig 2006-04-09 23:00:12 +0200
-+++ Makefile.in 2006-04-25 19:15:56 +0200
-@@ -20,8 +20,8 @@
- NAME = asy
- XNAME = x$(NAME)
+--- Makefile.in.orig 2006-06-19 05:36:26 +0200
++++ Makefile.in 2006-06-19 09:48:47 +0200
+@@ -28,8 +28,8 @@
+ OPTS = $(DEFS) $(CFLAGS)
+ INCL = -I . @INCL@
-CXX = @CXX@ -Wall -ansi
-CC = @CC@ -Wall -ansi
@@ -12,7 +12,7 @@
MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND
BISON = bison
LEX = @LEX@
-@@ -88,9 +88,9 @@
+@@ -92,9 +92,9 @@
install: install-asy install-man
@@ -23,10 +23,10 @@
+install-asy:
${INSTALL} -d $(bindir) $(asydir) $(exampledir) $(animationsdir)
-${INSTALL} -d $(latexdir)
- ${INSTALL} -p -m 755 -s $(NAME) $(bindir)
+ ${INSTALL} -p -m 755 $(NAME) $(EXTRABIN) $(bindir)
Index: doc/Makefile
---- doc/Makefile.orig 2006-04-09 23:00:12 +0200
-+++ doc/Makefile 2006-04-25 19:49:14 +0200
+--- doc/Makefile.orig 2006-06-19 05:36:12 +0200
++++ doc/Makefile 2006-06-19 09:49:21 +0200
@@ -4,7 +4,7 @@
doc: asymptote.dvi asymptote.info html man
@@ -42,7 +42,7 @@
-install-man: man
+install-man:
- ${INSTALL} -d $(docdir) $(mandir)/man1
+ ${INSTALL} -d -m 755 $(docdir) $(mandir)/man1
- ${INSTALL} -p -m 644 asymptote.pdf $(docdir)
${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asymptote/asymptote.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 asymptote.spec
--- openpkg-src/asymptote/asymptote.spec 23 May 2006 20:32:48 -0000
1.6
+++ openpkg-src/asymptote/asymptote.spec 19 Jun 2006 08:00:35 -0000
1.7
@@ -32,8 +32,8 @@
Class: EVAL
Group: Text
License: GPL
-Version: 1.06
-Release: 20060523
+Version: 1.07
+Release: 20060619
# list of sources
Source0:
http://switch.dl.sourceforge.net/asymptote/asymptote-%{version}.tar.gz
@@ -84,6 +84,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
%{l_make} %{l_mflags} install \
+ SHELL=%{l_bash} \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
latexdir=$RPM_BUILD_ROOT%{l_prefix}/share/texmf
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
