[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/octave/FC-3 octave.spec,1.21,1.22



Author: varekova

Update of /cvs/dist/rpms/octave/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv4853

Modified Files:
	octave.spec 
Log Message:
- fix problem with symlinks using ldconfig (bug 147922)
- add $RPM_OPT_FLAGS
- fix bug #161452 - octave-devel is missing dependencies
- fix bug #142440 - change octave.spec: autoconf is BuildPrereq
- fix bug #142631 - change octave.spec: mkoctfile.1.gz is part of octave-devel



Index: octave.spec
===================================================================
RCS file: /cvs/dist/rpms/octave/FC-3/octave.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- octave.spec	18 Oct 2004 15:04:43 -0000	1.21
+++ octave.spec	13 Jul 2005 12:34:37 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: A high-level language for numerical computations.
 Name: octave
 Version: 2.1.57
-Release: 7
+Release: 7.fc3
 Epoch: 6
 License: GPL
 Group: Applications/Engineering
@@ -13,8 +13,10 @@
 Requires: /sbin/install-info
 BuildPrereq: gnuplot bison flex less tetex gcc-c++ gcc-g77 gperf lapack blas 
 BuildPrereq: ncurses-devel zlib-devel libtermcap-devel libstdc++-devel
-BuildPrereq: readline-devel glibc-devel
+BuildPrereq: readline-devel glibc-devel autoconf
+Prereq: /sbin/ldconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: /etc/ld.so.conf.d
 Patch0: octave-2.1.50-help.patch
 Patch1: octave-2.1.57-signbit.patch
 ExcludeArch: ppc64 s390x
@@ -37,6 +39,8 @@
 %package devel
 Summary: Development headers and files for Octave
 Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release} readline-devel
+
 
 %description devel
 The octave-devel package contains files needed for developing
@@ -59,7 +63,9 @@
 %build
 LC_ALL=POSIX
 export LC_ALL
-CFLAGS="-fPIC -D_GNU_SOURCE" ./configure --enable-dl --enable-shared=yes --enable-rpath --enable-lite-kernel --enable-picky-flags --enable-static=no --with-g77 --prefix=/usr --infodir=/usr/share/info
+CXXFLAGS="$RPM_OPT_FLAGS -fPIC -D_GNU_SOURCE" ./configure --enable-dl --enable-shared=yes --enable-rpath --enable-lite-kernel --enable-picky-flags --enable-static=no --with-g77 --prefix=/usr --infodir=/usr/share/info --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -fPIC -D_GNU_SOURCE" ./configure --enable-dl --enable-shared=yes --enable-rpath --enable-lite-kernel --enable-picky-flags --enable-static=no --with-g77 --prefix=/usr --infodir=/usr/share/info --libdir=%{_libdir}
+
 
 make
 
@@ -72,15 +78,9 @@
 rm -f doc/interpreter/munge-texi doc/interpreter/*.o
 strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*
 
-#
-# Make library links in /usr/lib
-# XXX Not really clean.
-#
-pushd $RPM_BUILD_ROOT/%{_libdir}
-ln -s octave-%{version}/libcruft.so.%{version} libcruft.so
-ln -s octave-%{version}/liboctave.so.%{version} liboctave.so
-ln -s octave-%{version}/liboctinterp.so.%{version} liboctinterp.so
-popd
+# Make library links 
+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf
 
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R
@@ -101,15 +101,6 @@
    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
 fi
 
-#
-# Remove library links
-# XXX Kind of unclean.
-#
-pushd %{_libdir} &> /dev/null
-rm -f liboctave.so
-rm -f libcruft.so
-rm -f liboctinterp.so
-popd &> /dev/null
 
 %postun -p /sbin/ldconfig
 
@@ -120,12 +111,12 @@
 %doc doc/faq doc/liboctave doc/refcard emacs examples
 %{_bindir}/octave
 %{_bindir}/octave-%{version}
-%{_libdir}/lib*
+/etc/ld.so.conf.d/*
 %{_libdir}/octave*
 %{_datadir}/octave
 %{_libexecdir}/octave/%{version}
 %{_libexecdir}/octave/site
-%{_mandir}/man*/*
+%{_mandir}/man*/octave*
 %{_infodir}/octave.info*
 
 %files devel
@@ -134,10 +125,19 @@
 %{_bindir}/octave-bug*
 %{_bindir}/octave-config*
 %{_includedir}/octave*
+%{_mandir}/man*/mkoctfile*
 %{_libexecdir}/octave/ls-R
 
 
 %changelog
+* Tue Jul 13 2005 Ivana Varekova <varekova redhat com> 2.1.57-7.fc3
+- fix problem with symlinks using ldconfig (bug 147922)
+- add $RPM_OPT_FLAGS
+- fix bug #161452 - octave-devel is missing dependencies
+- fix bug #142440 - change octave.spec: autoconf is BuildPrereq
+- fix bug #142631 - change octave.spec: mkoctfile.1.gz is part of octave-devel 
+
+
 * Mon Oct 18 2004 Lon Hohberger <lhh redhat com> 2.1.57-7
 - Don't forget default attributes for -devel package
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]