SPECS: scilab.spec - %{_libdir} is here (or back)

glen glen at pld-linux.org
Mon Sep 19 10:08:54 CEST 2005 

Author: glen                         Date: Mon Sep 19 08:08:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_libdir} is here (or back)

---- Files affected:
SPECS:
   scilab.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/scilab.spec
diff -u SPECS/scilab.spec:1.51 SPECS/scilab.spec:1.52
--- SPECS/scilab.spec:1.51	Sat Sep 17 22:25:22 2005
+++ SPECS/scilab.spec	Mon Sep 19 10:08:48 2005
@@ -24,6 +24,8 @@
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-sh5.patch
 Patch3:		%{name}-amd64.patch
+Patch4:		%{name}-typo.patch
+Patch5:		%{name}-lib64.patch
 URL:		http://www-rocq.inria.fr/scilab/
 BuildRequires:	XFree86-devel
 BuildRequires:	Xaw3d-devel
@@ -77,6 +79,10 @@
 #%patch1 -p1
 %patch2 -p1
 #%patch3 -p1
+%if %{_lib} == "lib64"
+%patch4 -p1
+%endif
+%patch5 -p1
 
 head -n 438 aclocal.m4 > acinclude.m4
 tail -n 68 aclocal.m4 >>acinclude.m4
@@ -108,7 +114,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}-%{version}} \
 	$RPM_BUILD_ROOT{%{_examplesdir}/scilab,%{_appdefsdir}} \
-	$RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/bin \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin \
 	$RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -121,26 +127,26 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/{X11_defaults,contrib,demos,macros,man,maple,routines,tcl,.binary,scilab*} \
+mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{X11_defaults,contrib,demos,macros,man,maple,routines,tcl,.binary,scilab*} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 
-ln -fs %{_datadir}/%{name}-%{version}/contrib $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/contrib
-ln -fs %{_datadir}/%{name}-%{version}/demos $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/demos
-ln -fs %{_datadir}/%{name}-%{version}/macros $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/macros
-ln -fs %{_defaultdocdir}/%{name}-doc-%{version} $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/man
-ln -fs %{_datadir}/%{name}-%{version}/maple $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/maple
-ln -fs %{_datadir}/%{name}-%{version}/routines $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/routines
-ln -fs %{_datadir}/%{name}-%{version}/scilab.star $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/scilab.star
-ln -fs %{_datadir}/%{name}-%{version}/scilab.quit $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/scilab.quit
-ln -fs %{_datadir}/%{name}-%{version}/tcl $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/tcl
-ln -fs %{_datadir}/%{name}-%{version}/X11_defaults $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/X11_defaults
+ln -fs %{_datadir}/%{name}-%{version}/contrib $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/contrib
+ln -fs %{_datadir}/%{name}-%{version}/demos $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/demos
+ln -fs %{_datadir}/%{name}-%{version}/macros $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/macros
+ln -fs %{_docdir}/%{name}-doc-%{version} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/man
+ln -fs %{_datadir}/%{name}-%{version}/maple $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/maple
+ln -fs %{_datadir}/%{name}-%{version}/routines $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/routines
+ln -fs %{_datadir}/%{name}-%{version}/scilab.star $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/scilab.star
+ln -fs %{_datadir}/%{name}-%{version}/scilab.quit $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/scilab.quit
+ln -fs %{_datadir}/%{name}-%{version}/tcl $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/tcl
+ln -fs %{_datadir}/%{name}-%{version}/X11_defaults $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/X11_defaults
 
 # fix links
 ln -fs %{_libdir}/%{name}-%{version}/bin/{%{name},intersci,intersci-n} $RPM_BUILD_ROOT%{_bindir}/
 
-find $RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/bin -type f | xargs perl -pi -e "s#$RPM_BUILD_ROOT##g"
+find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin -type f | xargs perl -pi -e "s#$RPM_BUILD_ROOT##g"
 perl -pi -e 's#PVM_ROOT=\$SCI/pvm3#PVM_ROOT=%{_libdir}/%{name}-%{version}/pvm3#g' \
-	$RPM_BUILD_ROOT%{_prefix}/lib/%{name}-%{version}/bin/scilab
+	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin/scilab
 
 find $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/macros -name Makefile\* -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name .cvsignore -exec rm -f {} \;
@@ -159,29 +165,29 @@
 %doc ACKNOWLEDGEMENTS license.txt README_Unix CHANGES
 %lang(fr) %doc licence.txt
 %attr(755,root,root) %{_bindir}/scilab
-%dir %{_prefix}/lib/%{name}-%{version}
-#%%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/libtool
-%dir %{_prefix}/lib/%{name}-%{version}/bin
-%dir %{_prefix}/lib/%{name}-%{version}/pvm3
-%{_prefix}/lib/%{name}-%{version}/bin/.scicos_pal
-%{_prefix}/lib/%{name}-%{version}/bin/Blatdoc
-%{_prefix}/lib/%{name}-%{version}/bin/Blatdocs
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/bin/BEpsf
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/bin/Blatexpr*
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/bin/Blpr
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/bin/S*
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/bin/[a-z]*
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/pvm3/*
-%{_prefix}/lib/%{name}-%{version}/contrib
-%{_prefix}/lib/%{name}-%{version}/imp
-%{_prefix}/lib/%{name}-%{version}/macros
-%{_prefix}/lib/%{name}-%{version}/man
-%{_prefix}/lib/%{name}-%{version}/maple
-%{_prefix}/lib/%{name}-%{version}/routines
-%{_prefix}/lib/%{name}-%{version}/scilab.quit
-%{_prefix}/lib/%{name}-%{version}/scilab.star
-%dir %{_prefix}/lib/%{name}-%{version}/tcl
-%{_prefix}/lib/%{name}-%{version}/X11_defaults
+%dir %{_libdir}/%{name}-%{version}
+#%%attr(755,root,root) %{_libdir}/%{name}-%{version}/libtool
+%dir %{_libdir}/%{name}-%{version}/bin
+%dir %{_libdir}/%{name}-%{version}/pvm3
+%{_libdir}/%{name}-%{version}/bin/.scicos_pal
+%{_libdir}/%{name}-%{version}/bin/Blatdoc
+%{_libdir}/%{name}-%{version}/bin/Blatdocs
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/BEpsf
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/Blatexpr*
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/Blpr
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/S*
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/[a-z]*
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/pvm3/*
+%{_libdir}/%{name}-%{version}/contrib
+%{_libdir}/%{name}-%{version}/imp
+%{_libdir}/%{name}-%{version}/macros
+%{_libdir}/%{name}-%{version}/man
+%{_libdir}/%{name}-%{version}/maple
+%{_libdir}/%{name}-%{version}/routines
+%{_libdir}/%{name}-%{version}/scilab.quit
+%{_libdir}/%{name}-%{version}/scilab.star
+%dir %{_libdir}/%{name}-%{version}/tcl
+%{_libdir}/%{name}-%{version}/X11_defaults
 %dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/X11_defaults
 %{_datadir}/%{name}-%{version}/contrib
@@ -205,10 +211,10 @@
 # %{_datadir}/%{name}-%{version}/tcl/words
 %{_datadir}/%{name}-%{version}/.binary
 %{_datadir}/%{name}-%{version}/scilab*
-%dir %{_prefix}/lib/%{name}-%{version}/scripts
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/scripts/B*
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/scripts/sc*
-%{_prefix}/lib/%{name}-%{version}/util
+%dir %{_libdir}/%{name}-%{version}/scripts
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/scripts/B*
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/scripts/sc*
+%{_libdir}/%{name}-%{version}/util
 %{_desktopdir}/*
 %{_pixmapsdir}/%{name}.png
 
@@ -217,13 +223,13 @@
 %lang(fr) %doc man/fr
 %doc man/eng man/*.dtd
 %{_examplesdir}/scilab
-%{_prefix}/lib/%{name}-%{version}/demos
-%dir %{_prefix}/lib/%{name}-%{version}/tests
-%{_prefix}/lib/%{name}-%{version}/tests/*.sce
-%{_prefix}/lib/%{name}-%{version}/tests/*.ref
-%{_prefix}/lib/%{name}-%{version}/tests/*.tst
-%attr(755,root,root) %{_prefix}/lib/%{name}-%{version}/tests/*.sh
-#%%{_prefix}/lib/%{name}-%{version}/config
+%{_libdir}/%{name}-%{version}/demos
+%dir %{_libdir}/%{name}-%{version}/tests
+%{_libdir}/%{name}-%{version}/tests/*.sce
+%{_libdir}/%{name}-%{version}/tests/*.ref
+%{_libdir}/%{name}-%{version}/tests/*.tst
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/tests/*.sh
+#%%{_libdir}/%{name}-%{version}/config
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -231,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2005/09/19 08:08:48  glen
+- %{_libdir} is here (or back)
+
 Revision 1.51  2005/09/17 20:25:22  glen
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scilab.spec?r1=1.51&r2=1.52&f=u

More information about the pld-cvs-commit mailing list