rpms/blitz/devel blitz.spec,1.1,1.2

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/blitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17296

Modified Files:
	blitz.spec 
Log Message:
* Sat Dec 22 2007 Sergio Pascual <sergiopr at fedoraproject.com> 0.9-4
- Removed conflicting Makefiles from examples (bug #340751)
- Arch dependent gnu/bzconfig.h moved to %libdir/blitz/include/blitz/gnu



Index: blitz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blitz.spec	17 Oct 2007 19:07:49 -0000	1.1
+++ blitz.spec	4 Jan 2008 14:50:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name: blitz
 Version: 0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C++ class library for matrix scientific computing
 
 Group: Development/Libraries
@@ -41,15 +41,22 @@
 %build
 %configure --enable-shared --disable-static --disable-fortran
 %{__make} %{?_smp_mflags}
+# blitz.pc is created directly by configure
+# I use sed to add %%libdir/blitz to the include directories of the library
+# so that different bzconfig.h can be installed for different archs
+%{__sed} -i -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -I\${libdir}\/blitz\/include/" blitz.pc
 
 %install
 %{__rm} -fr %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
+%{__mkdir_p} %{buildroot}%{_libdir}/blitz/include/blitz
+%{__mv} %{buildroot}%{_includedir}/blitz/gnu %{buildroot}%{_libdir}/blitz/include/blitz
 %{__rm} -rf doc/doxygen/html/installdox
 # There are some empty files in doc, remove before copying in doc
 (find -empty | xargs rm)
 # Put in doc only the source code
 %{__rm} -rf examples/.deps
+%{__rm} -rf examples/Makefile*
 
 %check
 %{__make} %{?_smp_mflags} check-testsuite
@@ -80,10 +87,11 @@
 %doc AUTHORS LEGAL COPYING README LICENSE examples
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
+%{_libdir}/blitz
 %{_includedir}/*
 %{_infodir}/*
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
+#%exclude %{_infodir}/dir
 %exclude %{_libdir}/pkgconfig/blitz-uninstalled.pc
 
 %files doc
@@ -93,17 +101,25 @@
 
 
 %changelog
-* Wed Oct 17 2007 Sergio Pascual<spr at astrax.fis.ucm.es> 0.9-3
+* Sat Dec 22 2007 Sergio Pascual <sergiopr at fedoraproject.com> 0.9-4
+- Removed conflicting Makefiles from examples (bug #340751)
+- Arch dependent gnu/bzconfig.h moved to %%libdir/blitz/include/blitz/gnu
+
+* Wed Oct 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-3
 - Removed macro in changelog
+
 * Tue Oct 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-2
 - Excluding /usr/share/info/dir
+
 * Wed Oct 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-1
 - Changed wrong date in changelog
 - Changed license to gplv2 (some .h files haven't got the license text)
 - Changed _datadir/info/* to _infodir/%%{name}*
+
 * Thu Oct 02 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-0.2
 - Adding requires pkgconfig
 - Changed license tag
 - Removing requires(pre,un)
+
 * Thu May 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-0.1
 - Initial RPM file