rpms/abcde/devel abcde-2.1.19-genre.patch, NONE, 1.1 abcde-2.1.19-inst.patch, NONE, 1.1 abcde-2.1.19-vi.patch, NONE, 1.1 abcde.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sat Jan 15 08:17:26 UTC 2005

Author: wtogami

Update of /cvs/extras/rpms/abcde/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17278/devel

Modified Files:
	.cvsignore sources 
Added Files:
	abcde-2.1.19-genre.patch abcde-2.1.19-inst.patch 
	abcde-2.1.19-vi.patch abcde.spec 
Log Message:
auto-import abcde-2.2.0-1 on branch devel from abcde-2.2.0-1.src.rpm

abcde-2.1.19-genre.patch:

--- NEW FILE abcde-2.1.19-genre.patch ---
--- 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"
 	;;
 

abcde-2.1.19-inst.patch:

--- NEW FILE abcde-2.1.19-inst.patch ---
--- 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 \

abcde-2.1.19-vi.patch:

--- NEW FILE abcde-2.1.19-vi.patch ---
--- 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"


--- NEW FILE abcde.spec ---
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 <nphilipp at redhat.com>
- version 2.2.0

* Wed Apr 14 2004 Nils Philippsen <nphilipp at redhat.com>
- version 2.1.19

* Tue May 21 2002 Nils Philippsen <nphilipp at redhat.com>
- version 2.0.3
- update rh, genre patches

* Wed Apr 25 2001 Nils Philippsen <nphilipp at redhat.com>
- 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 <nphilipp at redhat.com>
- version 1.9.7
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2005 08:16:44 -0000	1.1
+++ .cvsignore	15 Jan 2005 08:17:24 -0000	1.2
@@ -0,0 +1 @@
+abcde_2.2.0.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2005 08:16:44 -0000	1.1
+++ sources	15 Jan 2005 08:17:24 -0000	1.2
@@ -0,0 +1 @@
+e21dd33ab3b4eca6758976120d8a4f22  abcde_2.2.0.orig.tar.gz


