rpms/osgcal/FC-6 .cvsignore, 1.3, 1.4 osgcal.spec, 1.10, 1.11 sources, 1.3, 1.4 osgcal-0.1.44-64bit.patch, 1.1, NONE

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/osgcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8159/FC-6

Modified Files:
	.cvsignore osgcal.spec sources 
Removed Files:
	osgcal-0.1.44-64bit.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2006 18:42:42 -0000	1.3
+++ .cvsignore	8 Oct 2007 18:30:13 -0000	1.4
@@ -1 +1 @@
-osgcal-0.1.44.tar.gz
+osgcal-0.1.46.tar.gz


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-6/osgcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- osgcal.spec	8 Oct 2007 16:32:09 -0000	1.10
+++ osgcal.spec	8 Oct 2007 18:30:13 -0000	1.11
@@ -1,19 +1,19 @@
 Name:           osgcal
-Version:        0.1.44
-Release:        5%{?dist}
+Version:        0.1.46
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://gna.org/projects/underware
-Source0:        http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1.44-64bit.patch
+Source0:        http://osgcal.dachary.org/download/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  OpenSceneGraph-devel cal3d-devel libxml2-devel glib2-devel
 BuildRequires:  libungif-devel libGL-devel SDL-devel xorg-x11-server-Xvfb
 BuildRequires:  xorg-x11-server-Xorg
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=323331
 ExcludeArch:    ppc64
 
 
@@ -34,13 +34,14 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bit~
 
 # Avoid lib64 rpaths
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
 # Fix rpmlint warnings
 chmod -x include/osgCal/HardwareModel
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
+
 
 
 %build
@@ -85,6 +86,12 @@
 
 
 %changelog
+* Mon Oct 08 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-1
+- Upstream sync
+- Remove no longer needed 64bit patch
+- Fix License and Source
+- Fix encoding on ChangeLog
+
 * Mon Oct 08 2007 Christopher Stone <chris.stone at gmail.com> 0.1.44-5
 - ExcludeArch ppc64 since OSG-devel is not build for this arch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgcal/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2006 18:42:42 -0000	1.3
+++ sources	8 Oct 2007 18:30:13 -0000	1.4
@@ -1 +1 @@
-c6f43aa6014fc7fdc7cc0ab9e4b5a885  osgcal-0.1.44.tar.gz
+96ac955dab57b1b5d74c8afeac46da46  osgcal-0.1.46.tar.gz


--- osgcal-0.1.44-64bit.patch DELETED ---