[cd-discid] Update to 1.3.1.

[Ville Skyttä]

commit a64f6bff715d91f0b8c90aacf47c5276b78a8238
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Jun 26 19:42:05 2012 +0300

    Update to 1.3.1.
    
    - Build with $RPM_LD_FLAGS.
    - Clean up specfile constructs no longer needed in Fedora or EL6+.

 .gitignore                                         |    2 +-
 ...sible-to-prevent-stripping-e.g.-with-STRI.patch |   35 ++++++++++++++++++++
 cd-discid.spec                                     |   23 +++++++------
 sources                                            |    2 +-
 4 files changed, 49 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e50208..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cd-discid-1.1.tar.gz
+/*.tar.*
diff --git a/0001-Make-it-possible-to-prevent-stripping-e.g.-with-STRI.patch b/0001-Make-it-possible-to-prevent-stripping-e.g.-with-STRI.patch
new file mode 100644
index 0000000..9c1db26
--- /dev/null
+++ b/0001-Make-it-possible-to-prevent-stripping-e.g.-with-STRI.patch
@@ -0,0 +1,35 @@
+From c56e0615e73b298ca8ad9bdb86f13a610c241232 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Tue, 26 Jun 2012 19:28:54 +0300
+Subject: [PATCH] Make it possible to prevent stripping e.g. with
+ STRIP=/bin/true.
+
+---
+ Makefile |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9ce21b9..cb82a6f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,7 @@
+ CC ?= cc
+ RM = rm -f
+ INSTALL = /usr/bin/install
++STRIP = strip
+ 
+ CFLAGS ?= -g -O2
+ CPPFLAGS ?=
+@@ -26,7 +27,8 @@ cd-discid: $(OBJS)
+ 	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+ 
+ install: cd-discid
+-	$(INSTALL) -D -s cd-discid $(BINDIR)/cd-discid
++	$(INSTALL) -D cd-discid $(BINDIR)/cd-discid
++	$(STRIP) $(BINDIR)/cd-discid
+ 	$(INSTALL) -D -m 644 cd-discid.1 $(MANDIR)/cd-discid.1
+ 
+ clean:
+-- 
+1.7.10.2
+
diff --git a/cd-discid.spec b/cd-discid.spec
index 40542c4..aafaf5b 100644
--- a/cd-discid.spec
+++ b/cd-discid.spec
@@ -1,14 +1,14 @@
 Name:           cd-discid
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Utility to get CDDB discid information
 
-Group:          Applications/Multimedia
 # Also "Larry Wall's Artistic" upstream, but that's not accepted in Fedora
 License:        GPLv2+
 URL:            http://linukz.org/cd-discid.shtml
 Source0:        http://linukz.org/download/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Sent upstream 2012-06-26
+Patch0:         0001-Make-it-possible-to-prevent-stripping-e.g.-with-STRI.patch
 
 %description
 cd-discid is a backend utility to get CDDB discid information for a
@@ -18,29 +18,30 @@ can be used for any purpose requiring CDDB data.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install PREFIX=$RPM_BUILD_ROOT%{_prefix} STRIP=:
 
 
 %files
-%defattr(-,root,root,-)
 %doc changelog COPYING README
 %{_bindir}/cd-discid
 %{_mandir}/man1/cd-discid.1*
 
 
 %changelog
+* Tue Jun 26 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.3.1-1
+- Update to 1.3.1.
+- Build with $RPM_LD_FLAGS.
+- Clean up specfile constructs no longer needed in Fedora or EL6+.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c1cef4..1e03801 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04cb368e3f1ce17e656ac6691ca0b687  cd-discid-1.1.tar.gz
+6f3379fca313ed9b7bab9405ed25dd12  cd-discid-1.3.1.tar.gz