From 14bb6bff056aa5950798a43d2289ba24471eb1c3 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Apr 15 2012 18:16:24 +0000
Subject: Update to 2.5.0.


- Clean up specfile constructs no longer needed in Fedora or EL6+.

---

diff --git a/.gitignore b/.gitignore
index f0cc9b5..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-abcde_2.4.2.orig.tar.gz
+/*.tar.*
diff --git a/abcde-2.1.19-inst.patch b/abcde-2.1.19-inst.patch
deleted file mode 100644
index 0f39e39..0000000
--- a/abcde-2.1.19-inst.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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.5.0-install.patch b/abcde-2.5.0-install.patch
new file mode 100644
index 0000000..1025d9a
--- /dev/null
+++ b/abcde-2.5.0-install.patch
@@ -0,0 +1,24 @@
+diff -up abcde-2.5.0/Makefile~ abcde-2.5.0/Makefile
+--- abcde-2.5.0/Makefile~	2012-04-13 23:56:01.000000000 +0300
++++ abcde-2.5.0/Makefile	2012-04-15 20:56:47.544597621 +0300
+@@ -14,14 +14,14 @@ clean:
+ 
+ install:
+ 	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -m 755 -o 0 abcde $(bindir)
+-	$(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
+-	$(INSTALL) -m 755 -o 0 abcde-musicbrainz-tool $(bindir)
++	$(INSTALL) -m 755 abcde $(bindir)
++	$(INSTALL) -m 755 cddb-tool $(bindir)
++	$(INSTALL) -m 755 abcde-musicbrainz-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.spec b/abcde.spec
index a612fb3..4cb6f1b 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,19 +1,17 @@
 Name:           abcde
-Version:        2.4.2
-Release:        4%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
-Group:          Applications/Multimedia
 # Public domain after 2010-01-01, see comments in abcde and cddb-tool
 License:        Public Domain
 URL:            http://code.google.com/p/abcde/
-Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
+Source0:        http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         %{name}-2.4.0-config.patch
 # http://code.google.com/p/abcde/issues/detail?id=17
-Patch1:         %{name}-2.1.19-inst.patch
+Patch1:         %{name}-2.5.0-install.patch
 # http://code.google.com/p/abcde/issues/detail?id=19
 Patch2:         %{name}-2.4.1-tagging.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       cd-discid
@@ -44,15 +42,12 @@ mv examples/cue2discid .
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/
+%doc abcde-musicbrainz-tool
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -62,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 15 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.5.0-1
+- Update to 2.5.0.
+- Clean up specfile constructs no longer needed in Fedora or EL6+.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 51178f9..84b050b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2147527c245ed70af7b218b642201669  abcde_2.4.2.orig.tar.gz
+4792184ae0a1711b23006d4333a79837  abcde-2.5.0.tar.gz