rpms/linbox/F-12 linbox-cflags-lflags.patch, NONE, 1.1 linbox-double-named.diff, NONE, 1.1 linbox-respect-destdir.diff, NONE, 1.1 linbox.spec, NONE, 1.1 sources, 1.1, 1.2

Mon Oct 19 17:32:31 UTC 2009

Author: tomspur

Update of /cvs/pkgs/rpms/linbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16943

Modified Files:
	sources 
Added Files:
	linbox-cflags-lflags.patch linbox-double-named.diff 
	linbox-respect-destdir.diff linbox.spec 
Log Message:
Initial import (#529466).


linbox-cflags-lflags.patch:
 linbox-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linbox-cflags-lflags.patch ---
--- linbox-config.in.orig	2008-06-14 03:21:00.000000000 +0200
+++ linbox-config.in	2009-10-18 13:44:39.000000000 +0200
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@ 
+       	echo -n " -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
        	;;
 
     --libs)
-       	echo -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@
+       	echo -n " -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0

linbox-double-named.diff:
 interfaces/driver/Makefile.am |    1 -
 linbox/matrix/Makefile.am     |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE linbox-double-named.diff ---
--- linbox/matrix/Makefile.am	2008-06-14 03:20:50.000000000 +0200
+++ linbox/matrix/Makefile.am2	2009-10-17 01:14:38.000000000 +0200
@@ -2,7 +2,6 @@
 
 BASIC_HDRS =			\
 	archetype.h		\
-	matrix-category.h	\
 	sparse.h		\
 	sparse.inl		\
 	transpose-matrix.h		\
--- interfaces/driver/Makefile.am	2008-09-17 03:38:49.000000000 +0200
+++ interfaces/driver/Makefile.am2	2009-10-17 01:31:17.000000000 +0200
@@ -29,7 +29,6 @@
 liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
 
 pkginclude_HEADERS=\
-		lb-driver.h	\
 		lb-blackbox-abstract.h		\
 		lb-blackbox-type.h  		\
 		lb-domain-function.h   		\

linbox-respect-destdir.diff:
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linbox-respect-destdir.diff ---
--- doc/Makefile.am.orig	2008-12-12 02:43:16.000000000 -0800
+++ doc/Makefile.am	2008-12-12 02:43:34.000000000 -0800
@@ -18,13 +18,13 @@
 	cp ../INSTALL linbox-html
 	cp ../COPYING linbox-html
 	cp ../AUTHORS linbox-html
 
 install-doc :
-	mkdir $(docdir)
-	cp -r linbox-html $(docdir)/linbox-html
-	cp linbox.html $(docdir)/linbox.html
+	mkdir -p $(DESTDIR)$(docdir)
+	cp -r linbox-html $(DESTDIR)$(docdir)/linbox-html
+	cp linbox.html $(DESTDIR)$(docdir)/linbox.html
 
 EXTRA_DIST=\
 	linbox.html		\
 	tutorial.html		\
 	install-dev.html	\


--- NEW FILE linbox.spec ---
Name:           linbox
Version:        1.1.6
Release:        6%{?dist}
Summary:        C++ Library for High-Performance Linear Algebra
Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.linalg.org/
Source0:        http://www.linalg.org/linbox-%{version}.tar.gz
# send upstream via mail Oct 17 2009
# Patch0 for respecting destdir, when installing the docs
Patch0:         %{name}-respect-destdir.diff
# send upstream via mail Oct 17 2009
# Patch1 for deleting double named headers in Makefiles
# if not applied 'install' will complain and break 'make install'
Patch1:         %{name}-double-named.diff
# Patch2 for emitting --cflags --lflags in one command
# if not applied only one command can be used at the same time
Patch2:         %{name}-cflags-lflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  atlas-devel
BuildRequires:  givaro-devel
BuildRequires:  gmp-devel
BuildRequires:  ntl-devel

BuildRequires:  automake
BuildRequires:  doxygen
BuildRequires:  libtool
BuildRequires:  tex(latex)

%description
LinBox is a C++ template library for exact, high-performance linear
algebra computation with dense, sparse, and structured matrices over
the integers and over finite fields.


%package        devel
Summary:        Development libraries/headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for development with %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch


%description    doc
Documentation for %{name}.


%prep
%setup -q
%patch0
%patch1
%patch2
find . -type f -name '*.C' | xargs chmod 0644
find . -type f -name '*.h' | xargs chmod 0644


%build
# Rebuild Makefile.in's from Makefile.am's, because our Patch0 fixes the
# Makefile.am to respect destdir.
aclocal -I macros
automake
%configure --enable-doc --with-givaro=yes --with-ntl=yes \
    --with-blas="%{_libdir}/atlas" --enable-shared \
    --enable-sage --enable-optimization --enable-drivers \
    --with-doxygen=yes --disable-rpath --disable-static

# Remove stupid rpaths
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la

# Remove docs that are installed in the wrong place
rm -rf %{buildroot}%{_prefix}/doc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%check
make -C tests check


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*


%files doc
%defattr(-,root,root,-)
%doc doc/linbox-html/*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_bindir}/%{name}-config
%{_mandir}/man1/%{name}-config.1*


%changelog
* Mon Oct 19 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-6
- installing docs breaks naming guidelines -> install them different

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-5
- properly install docs and don't mv them around
- add other files to %%doc

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-4
- %%check
- patch for --cflags and --lflags in config

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-3
- patches are send upstream
- correct BuildRequires
- INSTALL is not in %%doc

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-2
- disable static library
- patch for double named header files
- extra doc package

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.6-1
- Initial package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linbox/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:56:04 -0000	1.1
+++ sources	19 Oct 2009 17:32:30 -0000	1.2
@@ -0,0 +1 @@
+66288b0acfff70e81472b9cea225a3af  linbox-1.1.6.tar.gz


