From ed9695c1ed2ccd1ec3c2da51077f3355dd5996e5 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Jan 15 2005 08:17:24 +0000 Subject: auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..00915f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +abcde_2.2.0.orig.tar.gz diff --git a/abcde-2.1.19-genre.patch b/abcde-2.1.19-genre.patch new file mode 100644 index 0000000..d04d286 --- /dev/null +++ b/abcde-2.1.19-genre.patch @@ -0,0 +1,20 @@ +--- abcde-2.1.19/cddb-tool.genre 2003-12-06 22:28:53.000000000 +0100 ++++ abcde-2.1.19/cddb-tool 2004-04-14 13:08:37.901055971 +0200 +@@ -122,7 +122,7 @@ + DARTISTALBUM=$(grep ^DTITLE= "$CDDBFILE" | cut -f2- -d= | tr -d \\n | sed 's- / -~-g' | tr -d \[:cntrl:\]) + DARTIST=$(echo "$DARTISTALBUM" | cut -f1 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) + DALBUM=$(echo "$DARTISTALBUM" | cut -f2 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\]) +- CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d=) ++ CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) + if grep "^DYEAR" "$CDDBFILE" 2>&1 > /dev/null ; then + CDYEAR=$(grep "^DYEAR" "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\]) + elif grep YEAR "$CDDBFILE" 2>&1 > /dev/null ; then +@@ -192,7 +192,7 @@ + FILE="$1" + ADDRESS="$2" + DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\]) +- CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d=) ++ CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\]) + grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS" + ;; + diff --git a/abcde-2.1.19-inst.patch b/abcde-2.1.19-inst.patch new file mode 100644 index 0000000..0f39e39 --- /dev/null +++ b/abcde-2.1.19-inst.patch @@ -0,0 +1,21 @@ +--- abcde-2.1.19/Makefile.inst 2004-04-09 20:12:15.000000000 +0200 ++++ abcde-2.1.19/Makefile 2004-04-14 13:06:31.680708323 +0200 +@@ -14,13 +14,13 @@ + + install: + $(INSTALL) -d -m 755 $(bindir) +- $(INSTALL) -m 755 -o 0 abcde $(bindir) +- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) ++ $(INSTALL) -m 755 abcde $(bindir) ++ $(INSTALL) -m 755 cddb-tool $(bindir) + $(INSTALL) -d -m 755 $(mandir) +- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) +- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) ++ $(INSTALL) -m 644 abcde.1 $(mandir) ++ $(INSTALL) -m 644 cddb-tool.1 $(mandir) + $(INSTALL) -d -m 755 $(etcdir) +- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) ++ $(INSTALL) -m 644 abcde.conf $(etcdir) + + tarball: + @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ diff --git a/abcde-2.1.19-vi.patch b/abcde-2.1.19-vi.patch new file mode 100644 index 0000000..2c5dabd --- /dev/null +++ b/abcde-2.1.19-vi.patch @@ -0,0 +1,15 @@ +--- abcde-2.1.19/abcde.vi 2004-04-09 20:12:15.000000000 +0200 ++++ abcde-2.1.19/abcde 2004-04-14 13:03:40.296108335 +0200 +@@ -1270,8 +1270,12 @@ + eval $(echo "$EDITOR") "$CDDBDATA" + fi + # If that fails, check for a vi ++ elif [ -x /usr/bin/vim ]; then ++ /usr/bin/vim "$CDDBDATA" + elif [ -x /usr/bin/vi ]; then + /usr/bin/vi "$CDDBDATA" ++ elif [ -x /bin/vi ]; then ++ /bin/vi "$CDDBDATA" + # nano should be on all (modern, i.e., sarge) debian systems + elif [ -x /usr/bin/nano ]; then + /usr/bin/nano "$CDDBDATA" diff --git a/abcde.spec b/abcde.spec new file mode 100644 index 0000000..1e41e11 --- /dev/null +++ b/abcde.spec @@ -0,0 +1,62 @@ +Summary: A Better CD Encoder +Name: abcde +Version: 2.2.0 +Release: 1 +License: GPL & Artistic +Group: Applications/Multimedia +Source: http://www.hispalinux.es/~data/files/abcde_%{version}.orig.tar.gz +Patch0: abcde-2.1.19-vi.patch +Patch1: abcde-2.1.19-inst.patch +Patch2: abcde-2.1.19-genre.patch +URL: http://www.hispalinux.es/~data/abcde.php +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: cd-discid + +%description +abcde is a frontend command-line utility (actually, a shell script) that +grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, +all in one go. + +%prep +%setup -q +%patch0 -p1 -b .vi +%patch1 -p1 -b .inst +%patch2 -p1 -b .genre + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall etcdir=$RPM_BUILD_ROOT%{_sysconfdir} mandir=$RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-, root, root, -) +%doc changelog COPYING README TODO +%config(noreplace) %{_sysconfdir}/abcde.conf +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Fri Jan 14 2005 Nils Philippsen +- version 2.2.0 + +* Wed Apr 14 2004 Nils Philippsen +- version 2.1.19 + +* Tue May 21 2002 Nils Philippsen +- version 2.0.3 +- update rh, genre patches + +* Wed Apr 25 2001 Nils Philippsen +- version 1.9.9 +- configuration now uses freedb.org per default, no need to patch +- various artist media can have a different output file name (than single + artist ones) +- fix newlines with CR in parsing cddb genre + +* Tue Jan 09 2001 Nils Philippsen +- version 1.9.7 +- initial build + diff --git a/sources b/sources index e69de29..1da750c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e21dd33ab3b4eca6758976120d8a4f22 abcde_2.2.0.orig.tar.gz