diff --git a/.cvsignore b/.cvsignore index 86636f9..fb1236a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -chromium-bsu-0.9.14.tar.gz +chromium-bsu-0.9.14.1.tar.gz diff --git a/chromium-bsu-README.license b/chromium-bsu-README.license deleted file mode 100644 index e259616..0000000 --- a/chromium-bsu-README.license +++ /dev/null @@ -1,70 +0,0 @@ -The license file include with the Chromium BSU 0.9.14 sources tarbal, is -the original Artistic license, which is not acceptable for Fedora. I've -requested upstream to relicense Chromium under the clarified artistic license -and they have agreed, see below for the permission notice. - -They have already updated the license text in their source repository (git) -and the clarified artistic text will be the standard license for the next -release. - -Delft, 17 may 2009, - -Hans de Goede - - -Subject: -Re: chromium license -From: -"Mark B. Allan" -Date: -Mon, 27 Apr 2009 21:10:11 -0700 (PDT) -To: -Hans de Goede , Paul Wise - -Hi Hans - - -I am willing to relicense Chromium BSU to the Artistic Clarified license. Is there anything that needs to be done apart from changing the verbage in the COPYING file? - -Cheers --Mark - - ---- On Mon, 4/27/09, Paul Wise wrote: - -> > From: Paul Wise -> > Subject: Re: chromium license -> > To: "Hans de Goede" -> > Cc: "Mark B. Allan" -> > Date: Monday, April 27, 2009, 7:27 AM -> > On Mon, 2009-04-27 at 16:07 +0200, Hans de Goede wrote: -> > ->> > > I would very much like to package chromium for Fedora, -> > but there is one ->> > > small problem remaining, the main license for chromium -> > as included in ->> > > the tarbal is the *original* artistic license, -> > unfortunately that has been ->> > > deemed as a bad (troublesome) license by Fedora's -> > legal counsil ->> > > (lawyers != fun). So I wonder if you would be willing -> > to replace the ->> > > license with the clarified version of the artistic -> > license (relicense ->> > > is a big word here, if you do a side by side -> > comparison the differences ->> > > are very minimal). ->> > > ->> > > You can find the clarified version of the artistic -> > license here: ->> > > -> > https://fedoraproject.org/wiki/Licensing/ArtisticClarified -> > -> > I'd be happy to re-license the parts of the code I -> > wrote to pretty-much -> > any license, especially if that were the GNU GPLv3. -> > -> > -- -> > bye, -> > pabs -> > -> > http://bonedaddy.net/pabs3/ diff --git a/chromium-bsu.spec b/chromium-bsu.spec index a320e25..1d0b783 100644 --- a/chromium-bsu.spec +++ b/chromium-bsu.spec @@ -1,15 +1,14 @@ Name: chromium-bsu -Version: 0.9.14 -Release: 6%{?dist} +Version: 0.9.14.1 +Release: 1%{?dist} Summary: Fast paced, arcade-style, top-scrolling space shooter Group: Amusements/Games License: Artistic clarified URL: http://chromium-bsu.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: chromium-bsu-README.license BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils SDL-devel alsa-lib-devel libvorbis-devel -BuildRequires: libpng-devel libglpng-devel quesoglc-devel +BuildRequires: SDL_image-devel libpng-devel libglpng-devel quesoglc-devel BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 Requires: hicolor-icon-theme @@ -22,10 +21,6 @@ vessel. This is an OpenGL-based shoot 'em up game with fine graphics. %prep %setup -q -cp -a %{SOURCE1} README.license -iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8 -touch -r NEWS.utf8 NEWS -mv NEWS.utf8 NEWS %build @@ -36,7 +31,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -cp -a AUTHORS README README.license COPYING NEWS TODO \ +cp -a AUTHORS README COPYING NEWS \ $RPM_BUILD_ROOT%{_docdir}/%{name} # Put icon in the new fdo location mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps @@ -73,6 +68,11 @@ fi %changelog +* Mon Jun 21 2010 Hans de Goede 0.9.14.1-1 +- New upstream release 0.9.14.1 +- Drop Fedora specific README.license (upstream has fixed the included license) +- This fixes the FTBFS of the previous version (#599832) + * Fri Oct 9 2009 Hans de Goede 0.9.14-6 - Switch to quesoglc instead of ftgl (glc is the upstream default) - This fixes chromium-bsu not finding its font, as quesoglc properly uses diff --git a/sources b/sources index 2f98ea9..db68f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26df69b13e2ca370b6b45ac8e9efddd5 chromium-bsu-0.9.14.tar.gz +b8b41d08cd20cd870f497d06cf103db3 chromium-bsu-0.9.14.1.tar.gz