diff --git a/.gitignore b/.gitignore index 87ba5b7..2b92554 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ getid3-2.0.0b5.zip +/getid3-1.9.3-20111213.zip +/getID3-1.9.7.zip diff --git a/ampache.patch b/ampache.patch deleted file mode 100644 index b576bb4..0000000 --- a/ampache.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Naur getid3/module.audio.mp3.php getid3-new/module.audio.mp3.php ---- getid3/module.audio.mp3.php 2006-11-16 23:57:56.000000000 -0200 -+++ getid3-new/module.audio.mp3.php 2009-07-31 20:32:00.000000000 -0300 -@@ -1076,6 +1076,8 @@ - fseek($fd, $avdata_offset, SEEK_SET); - - $sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdata_offset); -+ // If sync < 1 then resort to default of 128 * 1024 -+ if ($sync_seek_buffer_size < 1) { $sync_seek_buffer_size = 128 * 1024; } - $header = fread($fd, $sync_seek_buffer_size); - $sync_seek_buffer_size = strlen($header); - $synch_seek_offset = 0; -diff -Naur getid3/module.audio.xiph.php getid3-new/module.audio.xiph.php ---- getid3/module.audio.xiph.php 2006-12-03 22:12:42.000000000 -0200 -+++ getid3-new/module.audio.xiph.php 2009-07-31 20:42:10.000000000 -0300 -@@ -849,6 +849,8 @@ - - - public static function OggPageSegmentLength($ogg_info_array, $segment_number=1) { -+ -+ if (!is_array($ogg_info_array['segment_table'])) { $ogg_info_array['segment_table'] = array(); } - - for ($i = 0; $i < $segment_number; $i++) { - $segment_length = 0; -@@ -859,6 +861,7 @@ - } - } - } -+ $segment_length = !$segment_length ? '1' : $segment_length; - return $segment_length; - } - -@@ -949,4 +952,4 @@ - - } - --?> -\ No newline at end of file -+?> -diff -Naur getid3/module.tag.id3v2.php getid3-new/module.tag.id3v2.php ---- getid3/module.tag.id3v2.php 2009-03-08 11:30:10.000000000 -0300 -+++ getid3-new/module.tag.id3v2.php 2009-07-31 20:38:37.000000000 -0300 -@@ -1928,8 +1928,8 @@ - $return_array['genre'][] = $genre_string; - - } else { -- -- while (strpos($genre_string, '(') !== false) { -+ //MODIFIED per #466 Bernhard Weyrauch fix endless loop if no ) -+ while (strpos($genre_string, '(') !== false AND (strpos($genre_string, ')') !== false)) { - - $start_pos = strpos($genre_string, '('); - $end_pos = strpos($genre_string, ')'); -@@ -3155,6 +3155,7 @@ - 'TPE3' => 'conductor', - 'TPE4' => 'remixer', - 'TPUB' => 'publisher', -+ 'TPOS' => 'disk', - 'TRC' => 'isrc', - 'TRCK' => 'track', - 'TRK' => 'track', -@@ -3280,4 +3281,4 @@ - - } - --?> -\ No newline at end of file -+?> -diff -Naur getid3/write.id3v2.php getid3-new/write.id3v2.php ---- getid3/write.id3v2.php 2006-12-26 00:44:22.000000000 -0200 -+++ getid3-new/write.id3v2.php 2009-07-31 20:32:00.000000000 -0300 -@@ -374,9 +374,8 @@ - } - - // rewrite file - no tag present or new tag longer than old tag -- else -- -- if (!$fp_source = @fopen($this->filename, 'rb')) { -+ else { -+ if (!$fp_source = @fopen($this->filename, 'rb')) { - throw new getid3_exception('Could not open '.$this->filename.' mode "rb"'); - } - fseek($fp_source, $engine->info['avdataoffset'], SEEK_SET); diff --git a/php-getid3.spec b/php-getid3.spec index e6b5df2..39cb1bb 100644 --- a/php-getid3.spec +++ b/php-getid3.spec @@ -1,14 +1,15 @@ Name: php-getid3 -Version: 2.0.0b5 -Release: 5%{?dist} -License: GPLv2 +Version: 1.9.7 +Release: 1%{?dist} +Epoch: 1 +License: LGPLv3+ Summary: The PHP media file parser Group: Development/Libraries URL: http://getid3.sourceforge.net/ -Source0: http://downloads.sourceforge.net/getid3/getid3-%{version}.zip -Patch0: ampache.patch +Source0: http://downloads.sourceforge.net/getid3/getID3-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 5.0.0 +Requires: php-common >= 5.0.0 +Requires: php-gd BuildArch: noarch %description @@ -18,15 +19,14 @@ other multimedia file formats (Ogg, WMA, WMV, ASF, WAV, AVI, AAC, VQF, FLAC, MusePack, Real, QuickTime, Monkey's Audio, MIDI and more). %prep -%setup -q -c -%patch0 -p0 -b .ampache -for i in ./*.txt demos/*.php; do +%setup -q -n getID3-%{version} +for i in ./*.txt licenses/*.txt demos/*.php; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" touch -r "$i" "${i}_" mv "${i}_" "$i" done sed -i 's/\r//' demos/index.php -sed -i 's/\r//' demos/demo.mysql.structure.sql +sed -i 's/\r//' changelog.txt %build @@ -41,12 +41,22 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc *.txt demos +%doc changelog.txt dependencies.txt licenses readme.txt structure.txt demos %{_datadir}/php/getid3 %changelog -* Fri Jul 20 2012 Fedora Release Engineering - 2.0.0b5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +* Sun Sep 08 2013 Roma - 1:1.9.7-1 +- Updated to 1.9.7 +- Changed license to LGPLv3+ + +* Thu Feb 14 2013 Fedora Release Engineering - 1:1.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Oct 07 2012 Paulo Roma - 1:1.9.3-1 +- Downgraded to latest stable version. +- Got needed extensions by using: + phpci print --recursive --report extension /usr/share/php/getid3/ +- Added BR php-gd. * Sat Jan 14 2012 Fedora Release Engineering - 2.0.0b5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 6576cc7..d854b8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2b24ccb4bd4a5c135517bd0ae3b2dd3 getid3-2.0.0b5.zip +156687ccda391102f9b5c2c55d209c44 getID3-1.9.7.zip