rpms/dx/devel dx-rpm.patch, NONE, 1.1 dx.desktop, NONE, 1.1 dx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sun Sep 17 01:10:36 UTC 2006
Author: rathann
Update of /cvs/extras/rpms/dx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9703/devel
Modified Files:
.cvsignore sources
Added Files:
dx-rpm.patch dx.desktop dx.spec
Log Message:
auto-import dx-4.4.0-4 on branch devel from dx-4.4.0-4.src.rpm
dx-rpm.patch:
--- NEW FILE dx-rpm.patch ---
--- 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
@@ -4,7 +4,7 @@
dxbindir = $(prefix)/bin
noinst_PROGRAMS = dxlocal
-archmakdir = $(prefix)/dx/lib_$(ARCH)
+archmakdir = $(libdir)
archmak_DATA = arch.mak
dxlocal_SOURCES = dx.c utils.c
@@ -15,5 +15,5 @@
if test ! -z "@INSTALL_BIN_PROGRAM@" ; then \
$(mkinstalldirs) $(prefix)/bin ; \
$(INSTALL) dxlocal at EXEEXT@ \
- $(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
+ $(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
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
-dxbindir = $(prefix)/dx/bin_ at ARCH@
+dxbindir = $(libdir)/dx/bin_ at ARCH@
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-uidatadir = $(prefix)/dx/ui
+uidatadir = $(datadir)/dx/ui
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
@@ -27,12 +27,12 @@
## libtool and the -shrext flag to make this much more
## portable.
-javadxdir = $(prefix)/dx/java/htmlpages
+javadxdir = $(libdir)/dx/java/htmlpages
javadx_DATA = dx.jar
-javasrvdir = $(prefix)/dx/java/server/class
+javasrvdir = $(libdir)/dx/java/server/class
javasrv_DATA = server.jar
EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README
-javalibdir = $(prefix)/dx/java/server/lib_ at ARCH@
+javalibdir = $(libdir)/dx/java/server/lib_ at ARCH@
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
@@ -1,6 +1,6 @@
-srvbindir = $(prefix)/dx/java/server/bin
-srvoutputdir = $(prefix)/dx/java/output
-userhtmldir = $(prefix)/dx/java/user
+srvbindir = $(libdir)/dx/java/server/bin
+srvoutputdir = $(libdir)/dx/java/output
+userhtmldir = $(libdir)/dx/java/user
# the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes
# 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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-serverdatadir = $(prefix)/dx/java/server/dxmacros
+serverdatadir = $(libdir)/dx/java/server/dxmacros
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
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
-dxbindir = $(prefix)/dx/bin_ at ARCH@
+dxbindir = $(libdir)/dx/bin_ at ARCH@
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
@@ -2,7 +2,7 @@
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D at ARCH@
-dxbindir = $(prefix)/dx/bin_ at ARCH@
+dxbindir = $(libdir)/dx/bin_ at ARCH@
dxbin_PROGRAMS = dxui
--- 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
@@ -2,7 +2,7 @@
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D at ARCH@
-dxbindir = $(prefix)/dx/bin_ at ARCH@
+dxbindir = $(libdir)/dx/bin_ at ARCH@
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
@@ -2,7 +2,7 @@
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D at ARCH@
-dxbindir = $(prefix)/dx/bin_ at ARCH@
+dxbindir = $(libdir)/dx/bin_ at ARCH@
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
@@ -7,7 +7,7 @@
INCLUDES = -I${top_srcdir}/include -D at ARCH@
-dxlibdir = $(prefix)/dx/lib_ at ARCH@
+dxlibdir = $(libdir)
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
@@ -1,6 +1,6 @@
SUBDIRS = libdx dxmods hwrender dpexec dxexec
-dxlibdir = $(prefix)/dx/lib_ at ARCH@
+dxlibdir = $(libdir)
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
@@ -9,7 +9,7 @@
libDXEXEC_la_SOURCES = main.c
libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
-bindir = $(prefix)/dx/bin_ at ARCH@
+bindir = $(libdir)/dx/bin_ at ARCH@
bin_PROGRAMS = dxexec
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
@@ -7,7 +7,7 @@
#INCLUDES = -I../../../include -D at ARCH@
INCLUDES = -I${top_srcdir}/include -D at ARCH@
-dxlibdir = $(prefix)/dx/lib_ at ARCH@
+dxlibdir = $(libdir)
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
@@ -66,7 +66,6 @@
#if linux
#include <linux/kernel.h>
-#include <linux/sys.h>
#include <sys/sysinfo.h>
#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
@@ -1,8 +1,9 @@
## Process this file with automake to produce Makefile.in
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D at ARCH@
+INCLUDES+=-I/usr/include/netcdf-3
-dxmdfdir = $(prefix)/dx/lib
+dxmdfdir = $(datadir)/dx/lib
noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
SUFFIXES = .c .y .c .s .h .o
@@ -13,6 +14,8 @@
dxmdf_DATA = dx.mdf
+user.c: dx.mdf
+
_complex.o: _compparse.h
HEADERS1 = \
--- 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
@@ -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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-dxincdir = $(prefix)/dx/include/dx
+dxincdir = $(prefix)/include/dx
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-dxbindir = $(prefix)/dx/bin
+dxbindir = $(libdir)/dx/bin
bindir = $(prefix)/bin
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
@@ -39,8 +39,8 @@
if [ $use_xbrowser = n ]; then
lynx "$url"
else
- netscape -remote "openURL($url)" 2> /dev/null || \
- (netscape "$url" &)
+ firefox -remote "openURL($url)" 2> /dev/null || \
+ (firefox "$url" &)
fi
;;
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
@@ -60,14 +60,7 @@
#
longhelp() {
-if test -f "$dxroot/man/catl/dx.l" ; then
- more "$dxroot/man/catl/dx.l"
-else
- echo "cannot find $dxroot/man/catl/dx.l"
- echo "set the DXROOT environment variable to the root of the"
- echo "dx installation tree and try again."
-fi
-exit 1
+man dx
cat << EOFlonghelp
command line parameters:
@@ -286,7 +279,7 @@
if [ -z "$DXROOT" ]; then
- prefix=@prefix@
+ prefix=@datadir@
DXROOT=$prefix/dx
fi
export DXROOT
@@ -298,6 +291,13 @@
fi
fi
+if [ -z "$DXFONTS" ]; then
+ DXFONTS=$DXROOT/fonts
+ if [ -d "$DXFONTS" ]; then
+ export DXFONTS
+ fi
+fi
+
# if DXMACROS not set, default it to the usual unless dir doesn't exist
if [ -z "$DXMACROS" ]; then
DXMACROS=$DXROOT/samples/macros
@@ -507,7 +507,7 @@
# default to running locally, from @prefix@/dx
exhost=$thishost
-dxroot=@prefix@/dx
+dxroot=@datadir@/dx
startup=1 # run the startup window by default
@@ -1469,8 +1469,8 @@
# Now set some needed results
-dxexroot=$dxroot
-dxuiroot=$dxroot
+dxexroot=@libdir@/dx
+dxuiroot=@libdir@/dx
dxexecdef="$dxexroot/bin_${exarch}/dxexec"
if test -z "$dxexec" ; then
dxexec=$dxexecdef
@@ -1600,7 +1600,7 @@
#
if test $tutor -eq 1 ; then
- cmd="$DXROOT/bin_${uiarch}/tutor"
+ cmd="$DXEXECROOT/bin_${uiarch}/tutor"
if test $seecomline -eq 1 ; then
set
echo "$echoparms exec $cmd $xparms"
@@ -1619,7 +1619,7 @@
prompterflags="$prompterflags -file \"$FileName\""
fi
- cmd="$DXROOT/bin_${uiarch}/prompter"
+ cmd="$DXEXECROOT/bin_${uiarch}/prompter"
if test $seecomline -eq 1 ; then
set
echo "$echoparms exec $cmd $prompterflags $xparms"
@@ -1635,7 +1635,7 @@
if test $startup -eq 1 ; then
- cmd="$DXROOT/bin_${uiarch}/startupui"
+ cmd="$DXEXECROOT/bin_${uiarch}/startupui"
if test $seecomline -eq 1 ; then
set
echo "$echoparms exec $cmd $xparms $*"
@@ -1649,7 +1649,7 @@
#
if test $builder -eq 1 ; then
- cmd="$DXROOT/bin_${uiarch}/builder"
+ cmd="$DXEXECROOT/bin_${uiarch}/builder"
if test $seecomline -eq 1 ; then
set
echo "exec $cmd $xparms $motifcmd $motifbind $FileName"
@@ -1674,7 +1674,7 @@
EncodedBase="${Base}-e"
echo "Creating encoded version of $FileName in ${EncodedBase}.net "
- cmd1="$DXROOT/bin_${uiarch}/dxencode"
+ cmd1="$DXEXECROOT/bin_${uiarch}/dxencode"
if test -f $CfgName ; then
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
@@ -1,6 +1,6 @@
#!/bin/sh
# Configure is looking for the following line
-prefix=@prefix@
+prefix=@datadir@
DFLTROOT=$prefix/dx
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
@@ -672,7 +672,7 @@
fi
dnl -- check for unix
else
- AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ])
+ AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg -L$libdir/hdf ])
AC_MSG_CHECKING(if HDF package is complete)
if test $passed -gt 0
then
@@ -681,7 +681,7 @@
AC_MSG_RESULT(no -- some components failed test)
have_hdf='no (failed tests)'
else
- LIB_HDF='-ldf'
+ LIB_HDF="-ldf -L$libdir/hdf"
LIBS="$LIB_HDF $LIBS"
FMT_LIBS="$FMT_LIBS libdf.a"
AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
@@ -761,8 +761,8 @@
AS_MESSAGE([checking for NETCDF support ......])
failed=0;
passed=0;
- AC_CHECK_HEADER(netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER(netcdf-3/netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+ AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -L$libdir/netcdf-3 ])
AC_MSG_CHECKING(if NETCDF package is complete)
if test $passed -gt 0
then
@@ -771,7 +771,7 @@
AC_MSG_RESULT(no -- some components failed test)
have_netcdf='no (failed tests)'
else
- LIB_NETCDF='-lnetcdf'
+ LIB_NETCDF="-lnetcdf -L$libdir/netcdf-3"
LIBS="$LIB_NETCDF $LIBS"
FMT_LIBS="$FMT_LIBS libnetcdf.a"
AC_DEFINE(HAVE_LIBNETCDF, 1, [Define to 1 if you have the NetCDF libraries])
@@ -1001,7 +1001,7 @@
Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
+ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-htmldir = $(prefix)/dx/html
+htmldir = $(datadir)/dx/html
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
@@ -1,4 +1,4 @@
-pagesdir = $(prefix)/dx/html/pages
+pagesdir = $(datadir)/dx/html/pages
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
@@ -1,5 +1,5 @@
-imagesdir = $(prefix)/dx/html/images
+imagesdir = $(datadir)/dx/html/images
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-helpdir = $(prefix)/dx/help
+helpdir = $(datadir)/dx/help
EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \
$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \
@@ -257,7 +257,7 @@
$(LN_S) hlpalhtl svsmstrh ; \
$(LN_S) hlpalhtl ugidx ; \
$(LN_S) hlpalhtl usrefidx ; \
- $(LN_S) HelpDir GarHelpDir ; \
+ $(LN_S) HelpDir GARHelpDir ; \
$(LN_S) HelpDir MBHelpDir ; \
echo "cd $(DESTDIR)$(helpdir)" ; \
echo "$(LN_S) hlpalhtl mbidx" ; \
@@ -265,6 +265,6 @@
echo "$(LN_S) hlpalhtl svsmstrh" ; \
echo "$(LN_S) hlpalhtl ugidx" ; \
echo "$(LN_S) hlpalhtl usrefidx" ; \
- echo "$(LN_S) HelpDir GarHelpDir" ; \
+ echo "$(LN_S) HelpDir GARHelpDir" ; \
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
@@ -1,4 +1,4 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = manl catl
+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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-mandir = $(prefix)/dx/man
+mandir = $(datadir)/man
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-fontdir = $(prefix)/dx/fonts
+fontdir = $(datadir)/dx/fonts
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
@@ -1,4 +1,4 @@
-libsdir = $(prefix)/dx/lib
+libsdir = $(datadir)/dx/lib
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
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-docdir = $(prefix)/dx/doc
+docdir = $(datadir)/dx/doc
doc_DATA = \
README README_SMP README_alphax README_aviion README_hp700 \
--- NEW FILE dx.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=OpenDX
Comment=Open Data Explorer
Icon=dx
Exec=dx
Terminal=false
Type=Application
Categories=Utility;Engineering;Graphics;Science;Motif;
StartupWMClass=startupWindow
--- NEW FILE dx.spec ---
Summary: Open source version of IBM's Visualization Data Explorer
Name: dx
Version: 4.4.0
Release: 4%{?dist}
URL: http://www.opendx.org/
Group: Applications/Engineering
Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch0: %{name}-rpm.patch
License: IBM Public License
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: desktop-file-utils
BuildRequires: flex
BuildRequires: hdf-devel
BuildRequires: ImageMagick-devel
#FIXME doesn't build currently
#BuildRequires: java-devel
#FIXME switch to lesstif when possible
#BuildRequires: lesstif-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libtool
BuildRequires: libXinerama-devel
BuildRequires: libXpm-devel
BuildRequires: netcdf-devel
BuildRequires: openmotif-devel
BuildRequires: openssh-clients
Requires: openssh-clients
%description
OpenDX is a uniquely powerful, full-featured software package for the
visualization of scientific, engineering and analytical data: Its open
system design is built on familiar standard interface environments. And its
sophisticated data model provides users with great flexibility in creating
visualizations.
%package devel
Summary: OpenDX module development headers and libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
If you want to write a module to use in the Data Explorer Visual Program
Editor, or in the scripting language, you will need this package.
%prep
%setup -q
%patch0 -p1 -b .r
%build
autoreconf --force --install
%configure \
--disable-static \
--enable-shared \
--with-jni-path=%{java_home}/include \
--without-javadx \
--disable-dependency-tracking \
--enable-smp-linux \
--enable-new-keylayout \
--with-rsh=%{_bindir}/ssh
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
ln -s ../../%{_lib}/dx/bin_linux $RPM_BUILD_ROOT%{_datadir}/dx/
mv $RPM_BUILD_ROOT%{_libdir}/arch.mak $RPM_BUILD_ROOT%{_includedir}/dx/
install -Dp -m644 src/uipp/ui/icon50.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/dx.xpm
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
# cleanup buildroot
rm -rf $RPM_BUILD_ROOT%{_datadir}/dx/doc
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,755)
%doc AUTHORS ChangeLog LICENSE NEWS doc/README*
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_libdir}/dx
%{_datadir}/dx
%{_mandir}/*/*
%{_datadir}/pixmaps/*.xpm
%{_datadir}/applications/*.desktop
%files devel
%defattr(644,root,root,755)
%{_includedir}/dx
%{_includedir}/*.h
%{_libdir}/lib*.so
%changelog
* 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
* Sat Sep 02 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-3
- removed -samples, will package separately
- disable java parts completely for now
- fixed build on fc6
- moved non-binary stuff to _datadir
* Tue Aug 29 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-2
- simplified autotools invocation
- added dist tag
* Tue Aug 22 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-1
- renamed to dx
- package samples
- install desktop file and icon
- use ssh instead of rsh
- run ldconfig for libs
* Sat Aug 19 2006 Dominik Mierzejewski <rpm at greysector.net>
- fixed remaining paths
- split off -devel package
- added missing BRs
- smp_mflags work again
- TODO: java parts
* Fri Aug 18 2006 Dominik Mierzejewski <rpm at greysector.net>
- initial build
- fix lib paths
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Sep 2006 23:28:18 -0000 1.1
+++ .cvsignore 17 Sep 2006 01:10:36 -0000 1.2
@@ -0,0 +1 @@
+dx-4.4.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Sep 2006 23:28:18 -0000 1.1
+++ sources 17 Sep 2006 01:10:36 -0000 1.2
@@ -0,0 +1 @@
+8fe6a09faea4aa713a1540f51371b719 dx-4.4.0.tar.gz
More information about the fedora-extras-commits
mailing list