rpms/dx-samples/devel dx-samples-nojava.patch, NONE, 1.1 dx-samples-rpm.patch, NONE, 1.1 dx-samples.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Tue Sep 19 23:27:06 UTC 2006
Author: rathann
Update of /cvs/extras/rpms/dx-samples/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25820/devel
Modified Files:
.cvsignore sources
Added Files:
dx-samples-nojava.patch dx-samples-rpm.patch dx-samples.spec
Log Message:
auto-import dx-samples-4.4.0-2 on branch devel from dx-samples-4.4.0-2.src.rpm
dx-samples-nojava.patch:
--- NEW FILE dx-samples-nojava.patch ---
--- dxsamples-4.4.0/Makefile.am.nojava 2002-01-28 21:53:08.000000000 +0100
+++ dxsamples-4.4.0/Makefile.am 2006-09-03 01:40:26.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = callmodule data dxlink java macros \
+SUBDIRS = callmodule data dxlink macros \
outboard program_guide programs scripts \
supervise tutorial user util stereo
dx-samples-rpm.patch:
--- NEW FILE dx-samples-rpm.patch ---
--- dxsamples-4.4.0/supervise/simpledemo/Makefile.am.r 2003-06-19 16:55:12.000000000 +0200
+++ dxsamples-4.4.0/supervise/simpledemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -3,7 +3,7 @@
SUBDIRS = interactors
-datadir = $(prefix)/dx/samples/supervise/simpledemo
+datadir = @datadir@/dx/samples/supervise/simpledemo
data_DATA = README demo demo.cfg demo.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/simpledemo/interactors/Makefile.am.r 2000-02-14 23:27:50.000000000 +0100
+++ dxsamples-4.4.0/supervise/simpledemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/simpledemo/interactors
+datadir = @datadir@/dx/samples/supervise/simpledemo/interactors
data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/interactors/Makefile.am.r 2003-06-19 16:53:34.000000000 +0200
+++ dxsamples-4.4.0/supervise/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/interactors
+datadir = @datadir@/dx/samples/supervise/interactors
data_DATA = Makefile_alphax Makefile_aviion Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris Makefile_sun4 README myinteractors.c module_make Makefile
--- dxsamples-4.4.0/supervise/mediumdemo/Makefile.am.r 2003-06-19 16:54:13.000000000 +0200
+++ dxsamples-4.4.0/supervise/mediumdemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -3,7 +3,7 @@
SUBDIRS = interactors
-datadir = $(prefix)/dx/samples/supervise/mediumdemo
+datadir = @datadir@/dx/samples/supervise/mediumdemo
data_DATA = README demo
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/mediumdemo/interactors/Makefile.am.r 2000-02-01 21:33:38.000000000 +0100
+++ dxsamples-4.4.0/supervise/mediumdemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/mediumdemo/interactors
+datadir = @datadir@/dx/samples/supervise/mediumdemo/interactors
data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
--- dxsamples-4.4.0/supervise/imagedemo/Makefile.am.r 2003-06-19 16:51:48.000000000 +0200
+++ dxsamples-4.4.0/supervise/imagedemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/imagedemo
+datadir = @datadir@/dx/samples/supervise/imagedemo
data_DATA = README demo demo.cfg demo.net demo1 demo1.cfg demo1.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/complexdemo/Makefile.am.r 2003-06-19 16:50:04.000000000 +0200
+++ dxsamples-4.4.0/supervise/complexdemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -3,7 +3,7 @@
SUBDIRS = data interactors nets
-datadir = $(prefix)/dx/samples/supervise/complexdemo
+datadir = @datadir@/dx/samples/supervise/complexdemo
data_DATA = README demo
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/complexdemo/data/Makefile.am.r 1999-05-06 00:02:17.000000000 +0200
+++ dxsamples-4.4.0/supervise/complexdemo/data/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/complexdemo/data
+datadir = @datadir@/dx/samples/supervise/complexdemo/data
data_DATA = frags.dx
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/complexdemo/nets/Makefile.am.r 1999-05-06 00:02:17.000000000 +0200
+++ dxsamples-4.4.0/supervise/complexdemo/nets/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/complexdemo/nets
+datadir = @datadir@/dx/samples/supervise/complexdemo/nets
data_DATA = ShowSelected.net hiliteObject.net peruDX.cfg peruDX.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/supervise/complexdemo/interactors/Makefile.am.r 2000-02-01 21:33:35.000000000 +0100
+++ dxsamples-4.4.0/supervise/complexdemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/supervise/complexdemo/interactors
+datadir = @datadir@/dx/samples/supervise/complexdemo/interactors
data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
--- dxsamples-4.4.0/data/Makefile.am.r 2003-06-19 07:09:12.000000000 +0200
+++ dxsamples-4.4.0/data/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/data
+datadir = @datadir@/dx/samples/data
-data_DATA = 2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter externalfilter.c externalfilter_alphax externalfilter_hp700 externalfilter_ibm6000 externalfilter_sgi externalfilter_solaris fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown!
.txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field.dx irregirreg2.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular!
.dx regularskewed.dx salesdata.data salesdata.txt sampletext.d!
x segm
ed_black-red.cm segmented_green-white.cm segmented_high-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx seriesdata.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
+data_DATA = 2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter.c fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown.txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field.dx irregirreg2!
.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular.dx regularskewed.dx salesdata.data salesdata.txt sampletext.dx segmented_black-red.cm segmented_green-white.cm segmented_h!
igh-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx s!
eriesd
.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/programs/SIMPLE/Makefile.am.r 2004-04-26 23:43:18.000000000 +0200
+++ dxsamples-4.4.0/programs/SIMPLE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/SIMPLE
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/SIMPLE
LINKLIST = \
Arrange.cfg\
--- dxsamples-4.4.0/programs/SCATTERED/Makefile.am.r 2002-04-30 20:53:08.000000000 +0200
+++ dxsamples-4.4.0/programs/SCATTERED/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/SCATTERED
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/SCATTERED
LINKLIST = \
AnnotationGlyphs.cfg\
--- dxsamples-4.4.0/programs/Makefile.am.r 2004-04-26 23:42:18.000000000 +0200
+++ dxsamples-4.4.0/programs/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -6,7 +6,7 @@
IMAGE_PROCESSING IMPORTING INTERFACE_CONTROL LOOPING MISC PLOTTING \
PROBES RENDERING SCATTERED SEQUENCER SIMPLE SUPERVISE
-datadir = $(prefix)/dx/samples/programs
+datadir = @datadir@/dx/samples/programs
data_DATA = $(DATA1) $(DATA2)
--- dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am.r 2002-04-30 20:53:22.000000000 +0200
+++ dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/DATA_DRIVEN_INTERACTORS
LINKLIST = \
DataDrivenInteractors.cfg\
--- dxsamples-4.4.0/programs/LOOPING/Makefile.am.r 2002-04-30 20:53:17.000000000 +0200
+++ dxsamples-4.4.0/programs/LOOPING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/LOOPING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/LOOPING
LINKLIST = \
Accumulate.cfg\
--- dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am.r 2002-04-30 20:53:24.000000000 +0200
+++ dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/CATEGORICAL
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/CATEGORICAL
LINKLIST = \
Categorical.cfg\
--- dxsamples-4.4.0/programs/SUPERVISE/Makefile.am.r 2002-04-30 20:53:01.000000000 +0200
+++ dxsamples-4.4.0/programs/SUPERVISE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/SUPERVISE
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/SUPERVISE
LINKLIST = \
Image_wo_UI.cfg\
--- dxsamples-4.4.0/programs/PROBES/Makefile.am.r 2002-04-30 20:53:11.000000000 +0200
+++ dxsamples-4.4.0/programs/PROBES/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/PROBES
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/PROBES
LINKLIST = \
PlotLine2.cfg\
--- dxsamples-4.4.0/programs/ANNOTATION/Makefile.am.r 2002-04-30 20:53:25.000000000 +0200
+++ dxsamples-4.4.0/programs/ANNOTATION/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/ANNOTATION
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/ANNOTATION
LINKLIST = \
AnnotationGlyphs.cfg\
--- dxsamples-4.4.0/programs/3D_DATA/Makefile.am.r 2002-04-30 20:53:26.000000000 +0200
+++ dxsamples-4.4.0/programs/3D_DATA/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/3D_DATA
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/3D_DATA
LINKLIST = \
AnnotationGlyphs.cfg\
--- dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am.r 2002-04-30 20:53:20.000000000 +0200
+++ dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/IMAGE_PROCESSING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/IMAGE_PROCESSING
LINKLIST = \
FFT.cfg\
--- dxsamples-4.4.0/programs/DEBUGGING/Makefile.am.r 2002-04-30 20:53:21.000000000 +0200
+++ dxsamples-4.4.0/programs/DEBUGGING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/DEBUGGING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/DEBUGGING
LINKLIST = \
Verify.cfg\
--- dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am.r 2002-04-30 20:53:23.000000000 +0200
+++ dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/COLORMAP_EDITOR
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/COLORMAP_EDITOR
LINKLIST = \
DataDrivenInteractors.cfg\
--- dxsamples-4.4.0/programs/COMPUTE/Makefile.am.r 2002-04-30 20:53:23.000000000 +0200
+++ dxsamples-4.4.0/programs/COMPUTE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/COMPUTE
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/COMPUTE
LINKLIST = \
Bounce.cfg\
--- dxsamples-4.4.0/programs/RENDERING/Makefile.am.r 2002-04-30 20:53:10.000000000 +0200
+++ dxsamples-4.4.0/programs/RENDERING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/RENDERING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/RENDERING
LINKLIST = \
FatLines.cfg\
--- dxsamples-4.4.0/programs/2D_DATA/Makefile.am.r 2002-04-30 20:53:26.000000000 +0200
+++ dxsamples-4.4.0/programs/2D_DATA/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/2D_DATA
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/2D_DATA
LINKLIST = \
AlternateVisualizations.cfg\
--- dxsamples-4.4.0/programs/MISC/Makefile.am.r 2002-04-30 20:53:13.000000000 +0200
+++ dxsamples-4.4.0/programs/MISC/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/MISC
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/MISC
LINKLIST = \
CensusData.cfg\
--- dxsamples-4.4.0/programs/SEQUENCER/Makefile.am.r 2002-04-30 20:53:07.000000000 +0200
+++ dxsamples-4.4.0/programs/SEQUENCER/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/SEQUENCER
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/SEQUENCER
LINKLIST = \
ContoursAndCaption.cfg\
--- dxsamples-4.4.0/programs/PLOTTING/Makefile.am.r 2002-04-30 20:53:12.000000000 +0200
+++ dxsamples-4.4.0/programs/PLOTTING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/PLOTTING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/PLOTTING
LINKLIST = \
Categorical.cfg\
--- dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am.r 2002-04-30 20:53:20.000000000 +0200
+++ dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/DISTRIBUTED_PROCESSING
LINKLIST = \
Distributed.cfg\
--- dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am.r 2002-04-30 20:53:18.000000000 +0200
+++ dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/INTERFACE_CONTROL
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/INTERFACE_CONTROL
LINKLIST = \
DialogStyle.cfg\
--- dxsamples-4.4.0/programs/IMPORTING/Makefile.am.r 2002-04-30 20:53:19.000000000 +0200
+++ dxsamples-4.4.0/programs/IMPORTING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-sampleprogdir = $(prefix)/dx/samples/programs/IMPORTING
+sampleprogdir = $(DESTDIR)@datadir@/dx/samples/programs/IMPORTING
LINKLIST = \
Categorical.cfg\
--- dxsamples-4.4.0/dxlink/Makefile.am.r 2003-10-20 05:28:44.000000000 +0200
+++ dxsamples-4.4.0/dxlink/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/dxlink
+datadir = @datadir@/dx/samples/dxlink
data_DATA = CensusData150.rgb CensusData150.size Imide_potential150.rgb \
Imide_potential150.size Makefile_alphax Makefile_aviion Makefile_hp700 \
--- dxsamples-4.4.0/scripts/Makefile.am.r 2003-06-19 16:58:07.000000000 +0200
+++ dxsamples-4.4.0/scripts/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/scripts
+datadir = @datadir@/dx/samples/scripts
data_DATA = AmbientLight Append Arrange Attribute AutoAxes AutoCamera AutoColor \
AutoGlyph AutoGrayScale Band Camera Caption ClipBox ClipPlane Collect \
--- dxsamples-4.4.0/stereo/src/Makefile.am.r 2005-02-01 07:20:27.000000000 +0100
+++ dxsamples-4.4.0/stereo/src/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/stereo/src
+datadir = @datadir@/dx/samples/stereo/src
data_DATA = mymodes.c mycams.c
--- dxsamples-4.4.0/stereo/Makefile.am.r 2001-06-21 23:30:41.000000000 +0200
+++ dxsamples-4.4.0/stereo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -2,7 +2,7 @@
SUBDIRS = src
-datadir = $(prefix)/dx/samples/stereo
+datadir = @datadir@/dx/samples/stereo
data_DATA = StereoMacro.net StereoState.net TestStereo.cfg TestStereo.net stereo.html
--- dxsamples-4.4.0/user/Makefile.am.r 2003-06-19 07:09:14.000000000 +0200
+++ dxsamples-4.4.0/user/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/user
+datadir = @datadir@/dx/samples/user
data_DATA = Makefile_inboard_alphax Makefile_inboard_aviion Makefile_inboard_hp700 Makefile_inboard_ibm6000 Makefile_inboard_ibmpvs Makefile_inboard_intelnt Makefile_inboard_sgi Makefile_inboard_solaris Makefile_inboard_sun4 Makefile_intelnt Makefile_loadable_alphax Makefile_loadable_hp700 Makefile_loadable_ibm6000 Makefile_loadable_intelnt Makefile_loadable_sgi Makefile_loadable_solaris Makefile_os2 Makefile_outboard_alphax Makefile_outboard_aviion Makefile_outboard_hp700 Makefile_outboard_ibm6000 Makefile_outboard_ibmpvs Makefile_outboard_intelnt Makefile_outboard_sgi Makefile_outboard_solaris Makefile_outboard_sun4 README add.c hello.c hello_loadable.mdf makex.c user_inboard.mdf user_loadable.mdf user_outboard.mdf
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/program_guide/Makefile.am.r 2005-02-01 07:19:50.000000000 +0100
+++ dxsamples-4.4.0/program_guide/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/program_guide
+datadir = @datadir@/dx/samples/program_guide
data_DATA = README add.c add.cfg add.mb add.mdf add.net add2.c add2.cfg \
add2.mb add2.mdf add2.net add2_invalid.cfg add2_invalid.net \
--- dxsamples-4.4.0/macros/Makefile.am.r 1999-05-06 00:02:05.000000000 +0200
+++ dxsamples-4.4.0/macros/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/macros
+datadir = @datadir@/dx/samples/macros
data_DATA = ArrangeMemberMacro.net AutoScaleMacro.net BandColorsMacro.net BarChartMacro.net CappedIsoMacro.net ClipSurfaceMacro.net ClipVolumeMacro.net ConvertColorNameListMacro.net DrapeMacro.net ExportVRML.net FactorialMacro.net FormatListMacro.net GetCategoricalLabelsMacro.net GetEventsMacro.net Image2Macro.net InsetImageMacro.net InterpolateCameraMacro.net InterpolatePositionsMacro.net KeyFrameCameraMacro.net MOS_statesMacro.net Make3DFieldMacro.net MakeLineMacro.net MapOnStatesMacro.net MatteMacro.net PickPlotMacro.net UnsquishGlyphMacro.net WindBarbsMacro.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/tutorial/Makefile.am.r 1999-05-06 00:02:19.000000000 +0200
+++ dxsamples-4.4.0/tutorial/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/tutorial
+datadir = @datadir@/dx/samples/tutorial
data_DATA = Animate.cfg Animate.net AutoColor.cfg AutoColor.net AutoColor2D.cfg AutoColor2D.net AutoGlyph2DScalar.cfg AutoGlyph2DScalar.net AutoGlyph2DVector.cfg AutoGlyph2DVector.net AutoGlyph3DScalar.cfg AutoGlyph3DScalar.net AutoGlyph3DVector.cfg AutoGlyph3DVector.net Caption.cfg Caption.net Color2D.cfg Color2D.net Compute.cfg Compute.net Connect.cfg Connect.net DataDrivenColormap.cfg DataDrivenColormap.net DataDrivenScalar.cfg DataDrivenScalar.net DataDrivenSelector.cfg DataDrivenSelector.net DataDrivenSequencer.cfg DataDrivenSequencer.net ImageProcessing.cfg ImageProcessing.net Isosurface2D.cfg Isosurface2D.net Isosurface3D.cfg Isosurface3D.net Map.cfg Map.net MapToPlane.cfg MapToPlane.net Plot.cfg Plot.net Regrid.cfg Regrid.net RubberSheet.cfg RubberSheet.net SampleMacro.net Slab.cfg Slab.net Streamlines2D.cfg Streamlines2D.net Streamlines3D.cfg Streamlines3D.net Switch.cfg Switch.net UseSampleMacro.cfg UseSampleMacro.net VolumeRendering.cfg VolumeRendering.net Warpe!
dGrid.cfg WarpedGrid.net batch_script example.general example1.cfg example1.net external.data spreadsheet.data view_isosurfaces.cfg view_isosurfaces.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/outboard/Makefile.am.r 2004-05-25 00:21:27.000000000 +0200
+++ dxsamples-4.4.0/outboard/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/outboard
+datadir = @datadir@/dx/samples/outboard
data_DATA = Makefile_alphax Makefile_aviion Makefile_hp700 Makefile_ibm6000 Makefile_ibmpvs Makefile_intelnt Makefile_linux Makefile_os2 Makefile_sgi Makefile_solaris Makefile_sun4 README async.c async.mdf dummy.c hello.c hello.mdf makedata my_simulation.c socket.c watchfile.c watchfile.mdf watchsocket.c watchsocket.cfg watchsocket.mdf watchsocket.net
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/callmodule/Makefile.am.r 2005-02-01 07:19:17.000000000 +0100
+++ dxsamples-4.4.0/callmodule/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/callmodule
+datadir = @datadir@/dx/samples/callmodule
data_DATA = README Simple.c ThunderStreamlines.c renderimage.c xapp_supervise.c
--- dxsamples-4.4.0/util/Makefile.am.r 2002-11-11 05:55:54.000000000 +0100
+++ dxsamples-4.4.0/util/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -3,7 +3,7 @@
SUBDIRS = dxf fluent mpeg plot3d biorad-pic
-datadir = $(prefix)/dx/samples/util
+datadir = @datadir@/dx/samples/util
data_DATA = Makefile.sample
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/util/fluent/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
+++ dxsamples-4.4.0/util/fluent/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/util/fluent
+datadir = @datadir@/dx/samples/util/fluent
data_DATA = Fluent2DX.c README
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/util/dxf/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
+++ dxsamples-4.4.0/util/dxf/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/util/dxf
+datadir = @datadir@/dx/samples/util/dxf
data_DATA = MANIFEST Makefile.sample README balloon.dxf colors.c common.c dx.c dxf.c dxf.h dxf_r12.txt entity.c entity.h header.c ignored.c output_funcs.c read.c snag_funcs.c table.c tree.c x29.dxf
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/util/plot3d/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
+++ dxsamples-4.4.0/util/plot3d/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/util/plot3d
+datadir = @datadir@/dx/samples/util/plot3d
data_DATA = Plot3DtoDX.c README
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/util/biorad-pic/Makefile.am.r 2002-11-11 05:55:35.000000000 +0100
+++ dxsamples-4.4.0/util/biorad-pic/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/util/biorad-pic
+datadir = @datadir@/dx/samples/util/biorad-pic
data_DATA = PIC2dx.c README
EXTRA_DIST = $(data_DATA)
--- dxsamples-4.4.0/util/mpeg/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
+++ dxsamples-4.4.0/util/mpeg/Makefile.am 2006-09-03 01:38:54.000000000 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-datadir = $(prefix)/dx/samples/util/mpeg
+datadir = @datadir@/dx/samples/util/mpeg
data_DATA = README default.param write_yuv.cfg write_yuv.net
EXTRA_DIST = $(data_DATA)
--- NEW FILE dx-samples.spec ---
Summary: OpenDX Examples
Name: dx-samples
Version: 4.4.0
Release: 2%{?dist}
URL: http://www.opendx.org/
Group: Documentation
Source0: http://opendx.npaci.edu/source/dxsamples-%{version}.tar.gz
Patch0: %{name}-rpm.patch
Patch1: %{name}-nojava.patch
License: IBM Public License
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dx
Requires: dx
%description
Examples for OpenDX.
%prep
%setup -q -n dxsamples-%{version}
%patch0 -p1 -b .r
%patch1 -p1 -b .nojava
%build
autoreconf --force --install
%configure --without-javadx
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc ChangeLog
%defattr(644,root,root,755)
%{_datadir}/dx/samples
%changelog
* Mon Sep 12 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-2
- fixed Requires:
* Sat Sep 02 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.0-1
- initial build
- don't include java samples for now
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dx-samples/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Sep 2006 22:04:55 -0000 1.1
+++ .cvsignore 19 Sep 2006 23:27:05 -0000 1.2
@@ -0,0 +1 @@
+dxsamples-4.4.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dx-samples/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Sep 2006 22:04:55 -0000 1.1
+++ sources 19 Sep 2006 23:27:05 -0000 1.2
@@ -0,0 +1 @@
+e8f43722ca0a66282608bded7c0e4f93 dxsamples-4.4.0.tar.gz
More information about the scm-commits
mailing list