[zita-resampler] Update to 1.1

[Brendan Jones]

commit bfb5cbcf8fc610007da4b014ace7e4ddb4ed5e25
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Mon Jul 2 22:28:58 2012 +0200

    Update to 1.1

 .gitignore                       |    1 +
 sources                          |    2 +-
 zita-resampler-fix-include.patch |   22 -------------------
 zita-resampler.spec              |   42 ++++++++++++++-----------------------
 4 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fce2751..9124cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zita-resampler-0.1.1.tar.bz2
+/zita-resampler-1.1.0.tar.bz2
diff --git a/sources b/sources
index 14a99f8..fcfd04a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbf0da8b7ace593082a5f01eed828109  zita-resampler-0.1.1.tar.bz2
+75037d8e9dcf068195ea96be5b86da4d  zita-resampler-1.1.0.tar.bz2
diff --git a/zita-resampler.spec b/zita-resampler.spec
index 0f59a9e..657dfc7 100644
--- a/zita-resampler.spec
+++ b/zita-resampler.spec
@@ -1,16 +1,11 @@
 Summary:       Fast, high-quality sample rate conversion library
 Name:          zita-resampler
-Version:       0.1.1
-Release:       5%{?dist}
-License:       GPLv2+
+Version:       1.1.0
+Release:       1%{?dist}
+License:       GPLv3+
 Group:         System Environment/Libraries
-URL:           http://www.kokkinizita.net/linuxaudio/zita-resampler/resampler.html
-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/zita-resampler-%{version}.tar.bz2
-# abort() in undefined in the header file unless we #include <stdlib.h>
-# Patch sent upstream via email as there is no bug tracker
-Patch0:        zita-resampler-fix-include.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+URL:           http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html
+Source0:       http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-%{version}.tar.bz2
 BuildRequires: libsndfile-devel
 
 %description
@@ -37,10 +32,9 @@ This package contains the headers and development libraries for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix.include
 
 # To make sure to have the correct Fedora specific flags:
-sed -i 's|-O2|%{optflags} -I../libs|' libs/Makefile
+sed -i -e 's|-O2|%{optflags} -I../libs|' -e 's|ldconfig||'  libs/Makefile
 sed -i 's|-O3|%{optflags} -I../libs|' apps/Makefile
 
 %build
@@ -49,39 +43,35 @@ make %{?_smp_mflags} -C libs
 # In order to build apps, we need to create the symlink
 # Note that this is originally done at "make install" stage
 ln -sf libzita-resampler.so.%{version} libs/libzita-resampler.so
+
 make %{?_smp_mflags} -C apps
 
 %install
 rm -rf %{buildroot}
 make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} -C libs install
-
-# The application name is too generic. Just rename:
-mkdir -p %{buildroot}%{_bindir}
-install -pm 755 apps/resample %{buildroot}%{_bindir}/zita-resample
-
-
-%clean
-rm -rf %{buildroot}
+make MANDIR=%{buildroot}%{_mandir}/man1 PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} -C apps install
+/sbin/ldconfig -n %{buildroot}/%{_libdir}
+chmod 755 %{buildroot}/%{_libdir}/lib%{name}.so.%{version}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/lib%{name}.so.*
-%{_bindir}/zita-resample
+%{_bindir}/zresample
+%{_mandir}/man1/zresample.1.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc docs/*
-%{_includedir}/%{name}.h
+%{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Jul 02 2012 Brendan Jones <brendan.jones.it at gmail.com> 1.1.0-1
+- Update to 1.1.0
+- Update URL, bring SPEC file up to date to current version
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild