rpms/dx/devel dx-rpm.patch,1.1,1.2 dx.spec,1.1,1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sun Sep 17 01:46:09 UTC 2006
- Previous message (by thread): rpms/galeon/devel .cvsignore, 1.7, 1.8 galeon.spec, 1.21, 1.22 sources, 1.8, 1.9 galeon-2.0.1-esc-ok.patch, 1.1, NONE galeon-2.0.1-typeahead-enter.patch, 1.1, NONE galeon-2.0.1-xul-enter.patch, 1.1, NONE
- Next message (by thread): rpms/atomix - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/extras/rpms/dx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10110
Modified Files:
dx-rpm.patch dx.spec
Log Message:
- fix make -jN build
dx-rpm.patch:
Index: dx-rpm.patch
===================================================================
RCS file: /cvs/extras/rpms/dx/devel/dx-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dx-rpm.patch 17 Sep 2006 01:10:36 -0000 1.1
+++ dx-rpm.patch 17 Sep 2006 01:46:09 -0000 1.2
@@ -1,5 +1,5 @@
--- dx-4.4.0/src/misc/Makefile.am.r 2003-07-12 02:12:13.000000000 +0200
-+++ dx-4.4.0/src/misc/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/misc/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -4,7 +4,7 @@
dxbindir = $(prefix)/bin
@@ -17,7 +17,7 @@
+ $(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
fi
--- dx-4.4.0/src/uipp/startup/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.0/src/uipp/startup/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/startup/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
@@ -28,7 +28,7 @@
dxbin_PROGRAMS = startupui
--- dx-4.4.0/src/uipp/ui/Makefile.am.r 2001-04-12 16:29:02.000000000 +0200
-+++ dx-4.4.0/src/uipp/ui/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/ui/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -38,7 +38,7 @@
DATA1 = \
icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \
--- dx-4.4.0/src/uipp/java/Makefile.am.r 2006-01-11 17:25:35.000000000 +0100
-+++ dx-4.4.0/src/uipp/java/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/java/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -27,12 +27,12 @@
## libtool and the -shrext flag to make this much more
## portable.
@@ -56,7 +56,7 @@
javalib_DATA = @ANYDX@
SUBDIRS = server dx layout
--- dx-4.4.0/src/uipp/java/server/Makefile.am.r 2001-05-21 16:47:39.000000000 +0200
-+++ dx-4.4.0/src/uipp/java/server/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/java/server/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
-srvbindir = $(prefix)/dx/java/server/bin
-srvoutputdir = $(prefix)/dx/java/output
@@ -68,7 +68,7 @@
# the server will expect to find a file dxserver.paths there to tell the exec where to find .net files
srvrundir = $(srvbindir)/../class
--- dx-4.4.0/src/uipp/java/server/macros/Makefile.am.r 1999-07-09 21:25:13.000000000 +0200
-+++ dx-4.4.0/src/uipp/java/server/macros/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/java/server/macros/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -78,7 +78,7 @@
serverdata_DATA = $(MACRO_FILES)
--- dx-4.4.0/src/uipp/tutor/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.0/src/uipp/tutor/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/tutor/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
@@ -89,7 +89,7 @@
dxbin_PROGRAMS = tutor
--- dx-4.4.0/src/uipp/dxui/Makefile.am.r 2003-07-12 02:12:17.000000000 +0200
-+++ dx-4.4.0/src/uipp/dxui/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/dxui/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -2,7 +2,7 @@
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D at ARCH@
@@ -100,7 +100,7 @@
--- dx-4.4.0/src/uipp/prompter/Makefile.am.r 2003-11-04 05:20:14.000000000 +0100
-+++ dx-4.4.0/src/uipp/prompter/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/prompter/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -2,7 +2,7 @@
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D at ARCH@
@@ -111,7 +111,7 @@
dxbin_PROGRAMS = prompter
--- dx-4.4.0/src/uipp/mb/Makefile.am.r 2003-08-20 16:21:33.000000000 +0200
-+++ dx-4.4.0/src/uipp/mb/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/mb/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D at ARCH@
@@ -122,7 +122,7 @@
dxbin_PROGRAMS = builder
--- dx-4.4.0/src/uipp/dxl/Makefile.am.r 2003-07-12 02:12:16.000000000 +0200
-+++ dx-4.4.0/src/uipp/dxl/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/uipp/dxl/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -7,7 +7,7 @@
INCLUDES = -I${top_srcdir}/include -D at ARCH@
@@ -133,7 +133,7 @@
noinst_HEADERS = \
dxlP.h \
--- dx-4.4.0/src/exec/Makefile.am.r 2003-09-17 00:40:40.000000000 +0200
-+++ dx-4.4.0/src/exec/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/exec/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
SUBDIRS = libdx dxmods hwrender dpexec dxexec
@@ -143,7 +143,7 @@
MAJOR_VERSION=@MAJOR_VERSION@
MINOR_VERSION=@MINOR_VERSION@
--- dx-4.4.0/src/exec/dxexec/Makefile.am.r 2006-01-11 17:24:39.000000000 +0100
-+++ dx-4.4.0/src/exec/dxexec/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/exec/dxexec/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -9,7 +9,7 @@
libDXEXEC_la_SOURCES = main.c
libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
@@ -154,7 +154,7 @@
dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
--- dx-4.4.0/src/exec/libdx/Makefile.am.r 2005-10-28 18:25:02.000000000 +0200
-+++ dx-4.4.0/src/exec/libdx/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/exec/libdx/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -7,7 +7,7 @@
#INCLUDES = -I../../../include -D at ARCH@
INCLUDES = -I${top_srcdir}/include -D at ARCH@
@@ -165,7 +165,7 @@
noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
#dxlib_LIBRARIES = libDXlite.a
--- dx-4.4.0/src/exec/libdx/memory.c.r 2006-01-03 01:57:41.000000000 +0100
-+++ dx-4.4.0/src/exec/libdx/memory.c 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/exec/libdx/memory.c 2006-09-17 03:29:07.000000000 +0200
@@ -66,7 +66,6 @@
#if linux
@@ -175,7 +175,7 @@
#endif
--- dx-4.4.0/src/exec/dxmods/Makefile.am.r 2003-08-19 00:51:10.000000000 +0200
-+++ dx-4.4.0/src/exec/dxmods/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/src/exec/dxmods/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,8 +1,9 @@
## Process this file with automake to produce Makefile.in
@@ -196,15 +196,50 @@
_complex.o: _compparse.h
HEADERS1 = \
+--- dx-4.4.0/src/exec/dxmods/local.mk.in.r 2003-07-12 02:12:06.000000000 +0200
++++ dx-4.4.0/src/exec/dxmods/local.mk.in 2006-09-17 03:31:32.000000000 +0200
+@@ -14,23 +14,23 @@
+
+ dxcm.mdf: ${srcdir}/dxmdf.src
+ -rm -f dxcm.mdf
+- cp ${srcdir}/dxmdf.src tmp.c
+- $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+- -rm -f tmp.c
++ cp ${srcdir}/dxmdf.src dxcm.tmp.c
++ $(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf
++ -rm -f dxcm.tmp.c
+
+ dx.mdf: ${srcdir}/dxmdf.src
+ echo MYINC: $(MYINC)
+ -rm -f dx.mdf
+- cp ${srcdir}/dxmdf.src tmp.c
+- $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++ cp ${srcdir}/dxmdf.src dx.tmp.c
++ $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf
+ @echo '/^ *$$/{' > stripl.sed
+ @echo 'N' >> stripl.sed
+ @echo '/^ *\\n *$$/D' >> stripl.sed
+ @echo '}' >> stripl.sed
+- cat dx.mdf |sed '/^#/d' > tmp.mdf
+- cat tmp.mdf |sed -f stripl.sed > dx.mdf
+- @rm -f stripl.sed tmp.mdf
+- -rm -f tmp.c
++ cat dx.mdf |sed '/^#/d' > dx.tmp.mdf
++ cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf
++ @rm -f stripl.sed dx.tmp.mdf
++ -rm -f dx.tmp.c
+
+ .y.h:
+ $(YACC) $(YFLAGS) -d ${srcdir}/$*.y
--- dx-4.4.0/include/Makefile.am.r 2001-08-16 22:12:41.000000000 +0200
-+++ dx-4.4.0/include/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/include/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,3 +1,3 @@
-dxincdir = $(prefix)/dx/include
+dxincdir = $(prefix)/include
SUBDIRS = dx
dxinc_HEADERS = dxl.h dxconfig.h dxstereo.h
--- dx-4.4.0/include/dx/Makefile.am.r 1999-05-26 01:35:16.000000000 +0200
-+++ dx-4.4.0/include/dx/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/include/dx/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -214,7 +249,7 @@
dxinc_HEADERS = \
UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
--- dx-4.4.0/bin/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/bin/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/bin/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -224,7 +259,7 @@
EXTRA_SCRIPTS = mdf2c dx
--- dx-4.4.0/bin/url_handler.sh.r 2002-04-11 01:32:54.000000000 +0200
-+++ dx-4.4.0/bin/url_handler.sh 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/bin/url_handler.sh 2006-09-17 03:29:07.000000000 +0200
@@ -39,8 +39,8 @@
if [ $use_xbrowser = n ]; then
lynx "$url"
@@ -237,7 +272,7 @@
;;
esac
--- dx-4.4.0/bin/dx.in.r 2004-05-31 18:12:05.000000000 +0200
-+++ dx-4.4.0/bin/dx.in 2006-09-12 02:16:07.000000000 +0200
++++ dx-4.4.0/bin/dx.in 2006-09-17 03:29:07.000000000 +0200
@@ -60,14 +60,7 @@
#
longhelp() {
@@ -343,7 +378,7 @@
echo "Copying $CfgName to ${EncodedBase}.cfg"
cmd2="cp $CfgName ${EncodedBase}.cfg"
--- dx-4.4.0/bin/mdf2c.in.r 1999-12-14 05:13:04.000000000 +0100
-+++ dx-4.4.0/bin/mdf2c.in 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/bin/mdf2c.in 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
# Configure is looking for the following line
@@ -353,7 +388,7 @@
root=${DXROOT=${DXEXECROOT=$DFLTROOT}}
--- dx-4.4.0/configure.ac.r 2006-01-03 22:20:51.000000000 +0100
-+++ dx-4.4.0/configure.ac 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/configure.ac 2006-09-17 03:29:07.000000000 +0200
@@ -672,7 +672,7 @@
fi
dnl -- check for unix
@@ -402,7 +437,7 @@
sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
--- dx-4.4.0/html/Makefile.am.r 2003-07-12 02:11:39.000000000 +0200
-+++ dx-4.4.0/html/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/html/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -412,7 +447,7 @@
SUBDIRS = pages images
--- dx-4.4.0/html/pages/Makefile.am.r 2002-06-20 06:38:03.000000000 +0200
-+++ dx-4.4.0/html/pages/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/html/pages/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,4 +1,4 @@
-pagesdir = $(prefix)/dx/html/pages
+pagesdir = $(datadir)/dx/html/pages
@@ -420,7 +455,7 @@
pages1 = \
insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
--- dx-4.4.0/html/images/Makefile.am.r 2002-04-01 10:51:13.000000000 +0200
-+++ dx-4.4.0/html/images/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/html/images/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,5 +1,5 @@
-imagesdir = $(prefix)/dx/html/images
@@ -429,7 +464,7 @@
images1 = \
3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \
--- dx-4.4.0/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/help/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/help/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -456,7 +491,7 @@
echo "$(LN_S) HelpDir MBHelpDir" ) \
'
--- dx-4.4.0/man/Makefile.am.r 1999-04-03 18:31:28.000000000 +0200
-+++ dx-4.4.0/man/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/man/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,4 +1,4 @@
## Process this file with automake to produce Makefile.in
@@ -464,7 +499,7 @@
+SUBDIRS = manl
--- dx-4.4.0/man/manl/Makefile.am.r 2002-05-20 06:47:06.000000000 +0200
-+++ dx-4.4.0/man/manl/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/man/manl/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -474,7 +509,7 @@
man_MANS = dx.l
EXTRA_DIST = $(man_MANS)
--- dx-4.4.0/fonts/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.0/fonts/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/fonts/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -484,7 +519,7 @@
font_DATA = \
README area.dx cyril_d.dx \
--- dx-4.4.0/lib/Makefile.am.r 2003-08-22 01:22:13.000000000 +0200
-+++ dx-4.4.0/lib/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/lib/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,4 +1,4 @@
-libsdir = $(prefix)/dx/lib
+libsdir = $(datadir)/dx/lib
@@ -492,7 +527,7 @@
libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
--- dx-4.4.0/doc/Makefile.am.r 1999-04-05 13:57:03.000000000 +0200
-+++ dx-4.4.0/doc/Makefile.am 2006-09-12 01:34:56.000000000 +0200
++++ dx-4.4.0/doc/Makefile.am 2006-09-17 03:29:07.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
Index: dx.spec
===================================================================
RCS file: /cvs/extras/rpms/dx/devel/dx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dx.spec 17 Sep 2006 01:10:36 -0000 1.1
+++ dx.spec 17 Sep 2006 01:46:09 -0000 1.2
@@ -1,7 +1,7 @@
Summary: Open source version of IBM's Visualization Data Explorer
Name: dx
Version: 4.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.opendx.org/
Group: Applications/Engineering
Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -107,6 +107,9 @@
%{_libdir}/lib*.so
%changelog
+* Sun Sep 17 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-5
+- fix make -jN build
+
* Sun Sep 03 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-4
- moved arch.mak to _includedir/dx
- fixed program startup from the main ui
- Previous message (by thread): rpms/galeon/devel .cvsignore, 1.7, 1.8 galeon.spec, 1.21, 1.22 sources, 1.8, 1.9 galeon-2.0.1-esc-ok.patch, 1.1, NONE galeon-2.0.1-typeahead-enter.patch, 1.1, NONE galeon-2.0.1-xul-enter.patch, 1.1, NONE
- Next message (by thread): rpms/atomix - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list