From ebef9b694386c615a60f7a53833891450260d9a0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 10 Jun 2009 04:51:26 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for php-getid3 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 1306e1d8ed11870d4ecfe5923b07c4450f1cc6c0 Mon Sep 17 00:00:00 2001 From: Paulo Roma Cavalcanti Date: Thu, 11 Jun 2009 14:10:14 +0000 Subject: [PATCH 2/4] Initial spec file. --- .cvsignore | 1 + ampache.patch | 38 ++++++++++++++++++++++++++++++++++ import.log | 1 + php-getid3.spec | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 95 insertions(+) create mode 100644 ampache.patch create mode 100644 import.log create mode 100644 php-getid3.spec diff --git a/.cvsignore b/.cvsignore index e69de29..87ba5b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +getid3-2.0.0b5.zip diff --git a/ampache.patch b/ampache.patch new file mode 100644 index 0000000..9a19e2a --- /dev/null +++ b/ampache.patch @@ -0,0 +1,38 @@ +diff -Naur getid3/module.audio.mp3.php getid3-ampache/module.audio.mp3.php +--- getid3/module.audio.mp3.php 2009-06-11 09:25:06.000000000 -0300 ++++ getid3-ampache/module.audio.mp3.php 2009-05-05 21:25:04.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.tag.id3v2.php getid3-ampache/module.tag.id3v2.php +--- getid3/module.tag.id3v2.php 2009-06-11 09:26:56.000000000 -0300 ++++ getid3-ampache/module.tag.id3v2.php 2009-05-05 21:25:04.000000000 -0300 +@@ -3155,6 +3155,7 @@ + 'TPE3' => 'conductor', + 'TPE4' => 'remixer', + 'TPUB' => 'publisher', ++ 'TPOS' => 'disk', + 'TRC' => 'isrc', + 'TRCK' => 'track', + 'TRK' => 'track', +diff -Naur getid3/write.id3v2.php getid3-ampache/write.id3v2.php +--- getid3/write.id3v2.php 2009-06-11 10:12:03.000000000 -0300 ++++ getid3-ampache/write.id3v2.php 2009-06-11 10:13:27.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/import.log b/import.log new file mode 100644 index 0000000..eee92bd --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +php-getid3-2_0_0b5-1_fc10:F-11:php-getid3-2.0.0b5-1.fc10.src.rpm:1244729368 diff --git a/php-getid3.spec b/php-getid3.spec new file mode 100644 index 0000000..ec61f48 --- /dev/null +++ b/php-getid3.spec @@ -0,0 +1,54 @@ +Name: php-getid3 +Version: 2.0.0b5 +Release: 1%{?dist} +License: GPLv2 +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: php >= 5.0.0 +BuildArch: noarch + +%description +getID3() is a PHP script that extracts useful information +(such as ID3 tags, bitrate, playtime, etc.) from MP3s & +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 + 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 + +%build + +%install +rm -rf %{buildroot} + +mkdir -p %{buildroot}%{_datadir}/php +cp -a getid3 %{buildroot}%{_datadir}/php/ + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc *.txt demos +%{_datadir}/php/getid3 + +%changelog + +* Thu Jun 04 2009 Paulo Roma 2.0.0b5-1 +- Updated to 2.0.0b5 +- Patched with ampache fixes. + +* Thu Jun 04 2009 Paulo Roma 1.7.9-1 +- Initial spec file. diff --git a/sources b/sources index e69de29..6576cc7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d2b24ccb4bd4a5c135517bd0ae3b2dd3 getid3-2.0.0b5.zip From 88e72a08f1062dd4fdabfb1724bbe5b79d36644e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:58:36 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18d7963..49e4f66 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := php-getid3 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 13f5628bb63b5411bb99442a1d0a82da0d335ae8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 08:55:21 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 49e4f66..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: php-getid3 -# $Id$ -NAME := php-getid3 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index eee92bd..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -php-getid3-2_0_0b5-1_fc10:F-11:php-getid3-2.0.0b5-1.fc10.src.rpm:1244729368