rpms/givaro/F-11 givaro.spec,1.1,1.2

[mycae]

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7061

Modified Files:
	givaro.spec 
Log Message:
*Update to 3.3.0




Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/givaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- givaro.spec	14 Sep 2009 10:13:32 -0000	1.1
+++ givaro.spec	9 Oct 2009 11:58:46 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		givaro
-Version:	3.2.15
-Release:	0.2.rc1%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
-#GPL boilerplate missing. Upstream has been notified via email
-License:	GPL+
+License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
+Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
 Source1:	givaro-config.h
 Patch0:		givaro-config-script.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +51,13 @@ The static libraries for using %{name} f
 cp %{SOURCE1} new-givaro-config.h
 
 sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+do
+	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
+	touch -r $i $i.new && \
+	mv $i.new $i
+done
 %patch0
 
 
@@ -87,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
+- Update to 3.3.0
+- Relicence per CeCILL-B
+
 * Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment