- packed examples

- rel. 9

Changed files:
    dx.spec -> 1.37
    dxsamples-DESTDIR.patch -> 1.2
    dxsamples-unused_bin.patch -> 1.1

diff --git a/dx.spec b/dx.spec
index f5bd09d180b6b8e7db42a7fff24bfb570efcf8e5..699a70ca2dfd715fb6bdfb5c411f969645f5ecfb 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -1,11 +1,8 @@
-#
-# TODO: - add samples
-#
 Summary:       Excellent tool for making visualization of data
 Summary(pl):   Doskona³e narzêdzie do wizualizacji danych
 Name:          dx
 Version:       4.3.2
-Release:       8
+Release:       9
 License:       IPL
 Group:         Applications
 Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -16,6 +13,7 @@ Source2:      %{name}.desktop
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-nolibs.patch
 Patch2:                dxsamples-DESTDIR.patch
+Patch3:                dxsamples-unused_bin.patch
 URL:           http://www.opendx.org/
 BuildRequires: ImageMagick-devel >= 1:6.2.4.0
 BuildRequires: OpenGL-devel-base
@@ -94,10 +92,23 @@ Online help and html documentation for OpenDX.
 %description doc -l pl
 Podrêczna pomoc oraz dokumentacja html dla OpenDX.
 
+%package examples
+Summary:       OpenDX Examples
+Summary(pl):   Przyk³ady dla OpenDX
+Group:         Documentation
+
+%description examples
+Examples for OpenDX.
+
+%description examples -l pl
+Przyk³ady dla OpenDX.
+
 %prep
-%setup  -q
+%setup  -q -a 1
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p0
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -114,15 +125,30 @@ Podr
        --enable-new-keylayout \
        --without-javadx
 
+( cd %{name}samples-%{version} && \
+  %{__aclocal} && \
+  %{__autoheader} && \
+  %{__autoconf} && \
+  %{__automake} && \
+  %configure \
+       --prefix=%{_examplesdir} \
+       --without-javadx \
+)
+
 %{__make}
 
+( cd %{name}samples-%{version} && %{__make} )
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+( cd %{name}samples-%{version} && %{__make} install DESTDIR=$RPM_BUILD_ROOT )
+
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install src/uipp/ui/icon50.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/dx.xpm
@@ -131,6 +157,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/dx/man/manl $RPM_BUILD_ROOT%{_mandir}
 mv $RPM_BUILD_ROOT%{_datadir}/dx/include/* $RPM_BUILD_ROOT%{_includedir}
 mv $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux $RPM_BUILD_ROOT%{_libdir}/dx
 mv $RPM_BUILD_ROOT%{_datadir}/dx/bin_linux $RPM_BUILD_ROOT%{_libdir}/dx
+mv $RPM_BUILD_ROOT%{_examplesdir}/dx/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 ln -s %{_libdir}/dx $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux
 ln -s %{_libdir}/dx/bin_linux $RPM_BUILD_ROOT%{_datadir}/dx
 rm -rf $RPM_BUILD_ROOT%{_datadir}/{bin,dx/{bin/dx,man,include,doc}}
@@ -173,3 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %files doc
 %defattr(644,root,root,755)
 %{_datadir}/dx/h*
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}

diff --git a/dxsamples-DESTDIR.patch b/dxsamples-DESTDIR.patch
index 7c64906ea07cbff47962e19b2f035af7dccf4840..f0f1cc084e66460a38ab4903a2dac6e516fbca3a 100644 (file)
--- a/dxsamples-DESTDIR.patch
+++ b/dxsamples-DESTDIR.patch
@@ -265,3 +265,37 @@ diff -urN dxsamples-4.3.2.orig/stereo/src/Makefile.am dxsamples-4.3.2/stereo/src
  
  uninstall-local:
        rm $(datadir)/makefile
+--- dxsamples-4.3.2/java/Makefile.am.orig      2006-02-04 11:59:32.000000000 +0100
++++ dxsamples-4.3.2/java/Makefile.am   2006-02-04 11:59:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+  
+-javasampdir = $(prefix)/dx/java/htmlpages
++javasampdir = $(prefix)/dx/samples/java/htmlpages
+ javasamp_DATA = $(WEB_FILES)
+ EXTRA_DIST = $(WEB_FILES)
+  
+--- dxsamples-4.3.2/java/nets/Makefile.am.orig 2006-02-04 12:34:45.000000000 +0100
++++ dxsamples-4.3.2/java/nets/Makefile.am      2006-02-04 12:34:55.000000000 +0100
+@@ -1,4 +1,4 @@
+-javanetsdir = $(prefix)/dx/java/server/nets
++javanetsdir = $(prefix)/dx/samples/java/server/nets
+ javanets_DATA = $(NET_FILES)
+ EXTRA_DIST = $(NET_FILES)
+ NET_FILES = AutoInsurance.cfg AutoInsurance.net \
+--- dxsamples-4.3.2/java/userdata/Makefile.am.orig     2006-02-04 12:33:39.000000000 +0100
++++ dxsamples-4.3.2/java/userdata/Makefile.am  2006-02-04 12:33:56.000000000 +0100
+@@ -1,4 +1,4 @@
+-javadatadir = $(prefix)/dx/java/server/userdata
++javadatadir = $(prefix)/dx/samples/java/server/userdata
+ DATA_FILES = AutoInsurance.txt CCAll.dx Makefile.am Norm.dx apt.txt arf.txt asr.txt enhigh.cxn enhigh.txt enlow.cxn enlow.txt ibm94.txt ibm95.txt ibm96.txt mf1.txt npvcall.cm npvcall2.cm option.cm
+ javadata_DATA = $(DATA_FILES)
+ EXTRA_DIST = $(DATA_FILES)
+--- dxsamples-4.3.2/java/usermacros/Makefile.am.orig   2006-02-04 12:39:29.000000000 +0100
++++ dxsamples-4.3.2/java/usermacros/Makefile.am        2006-02-04 12:39:35.000000000 +0100
+@@ -1,4 +1,4 @@
+-javamacrodir = $(prefix)/dx/java/server/usermacros
++javamacrodir = $(prefix)/dx/samples/java/server/usermacros
+ 
+ MACRO_FILES = ClassifyMacro.net Legend2Macro.net MOSFromLongLat.net \
+       bschols.net kmeansmacro.net logn.net optsurf.net \

diff --git a/dxsamples-unused_bin.patch b/dxsamples-unused_bin.patch
new file mode 100644 (file)
index 0000000..fa197bd
--- /dev/null
+++ b/dxsamples-unused_bin.patch
@@ -0,0 +1,9 @@
+--- dx-4.3.2/dxsamples-4.3.2/data/Makefile.am.orig     2006-02-04 11:39:22.000000000 +0100
++++ dx-4.3.2/dxsamples-4.3.2/data/Makefile.am  2006-02-04 11:40:20.000000000 +0100
+@@ -3,5 +3,5 @@
+ 
+ datadir = $(prefix)/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.dx segmented_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 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_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
+ EXTRA_DIST = $(data_DATA)