SPECS: dx.spec - packed examples - rel. 9

maciek2w maciek2w at pld-linux.org
Sat Feb 4 13:27:17 CET 2006


Author: maciek2w                     Date: Sat Feb  4 12:27:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- packed examples
- rel. 9

---- Files affected:
SPECS:
   dx.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/dx.spec
diff -u SPECS/dx.spec:1.36 SPECS/dx.spec:1.37
--- SPECS/dx.spec:1.36	Mon Oct  3 20:09:59 2005
+++ SPECS/dx.spec	Sat Feb  4 13:27:11 2006
@@ -1,12 +1,9 @@
 # $Revision$, $Date$
-#
-# 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
@@ -17,6 +14,7 @@
 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
@@ -95,10 +93,23 @@
 %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}
@@ -115,15 +126,30 @@
 	--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
@@ -132,6 +158,7 @@
 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}}
@@ -175,12 +202,20 @@
 %defattr(644,root,root,755)
 %{_datadir}/dx/h*
 
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/02/04 12:27:11  maciek2w
+- packed examples
+- rel. 9
+
 Revision 1.36  2005/10/03 18:09:59  arekm
 - br new imagemagick
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dx.spec?r1=1.36&r2=1.37&f=u



More information about the pld-cvs-commit mailing list