rpms/vorbis-tools/devel vorbis-tools.spec, 1.33, 1.34 vorbis-tools-1.0-build.patch, 1.1, NONE vorbis-tools-1.0-curlconfig.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/vorbis-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22461

Modified Files:
	vorbis-tools.spec 
Removed Files:
	vorbis-tools-1.0-build.patch vorbis-tools-1.0-curlconfig.patch 
Log Message:
* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.n> - 1:1.2.0-2
- Stop calling autoconf, this was no longer necessarry and in current
  rawhide breaks us from building (because aclocal.m4 does not match
  the new autoconf version)
- Drop our last 2 patches, they were modifying configure, but since we called
  autoconf after that in effect they were not doing anything, review has
  confirmed that they indeed are no longer needed)
- Drop using system libtool hack, this is dangerous when the libtool used
  to generate ./configure and the one used differ
- Remove various antique checks (for example check if RPM_BUILD_ROOT == /) 
- Drop unnecessary explicit library Requires
- Cleanup BuildRequires



Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vorbis-tools.spec	11 Mar 2008 12:25:38 -0000	1.33
+++ vorbis-tools.spec	31 May 2008 14:36:17 -0000	1.34
@@ -1,26 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Patch0:		vorbis-tools-1.0-build.patch
-Patch1:		vorbis-tools-1.0-curlconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	libogg >= 2:1.1
-Requires:	libvorbis >= 1:%{version} 
-Requires:	libao >= 0.8.4
-BuildRequires:	libvorbis-devel >= 1:%{version}
-BuildRequires:  libao-devel >= 0.8.4
-BuildRequires:  curl-devel >= 7.8
-BuildRequires:	speex-devel 
-BuildRequires:  flac-devel
-BuildRequires:	libtool
-BuildRequires:	libogg-devel
-
+BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
 Provides:	vorbis = %{epoch}:%{version}-%{release}
 
@@ -32,37 +20,47 @@
 The vorbis package contains an encoder, a decoder, a playback tool, and a
 comment editor.
 
+
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
-%build
-autoconf
-perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
-perl -p -i -e "s/-ffast-math//" configure
 
+%build
 %configure
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags}
 
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
 
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
 
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README ogg123/ogg123rc-example
 %{_bindir}/*
 %{_mandir}/man1/*
 
-%clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.n> - 1:1.2.0-2
+- Stop calling autoconf, this was no longer necessarry and in current
+  rawhide breaks us from building (because aclocal.m4 does not match
+  the new autoconf version)
+- Drop our last 2 patches, they were modifying configure, but since we called
+  autoconf after that in effect they were not doing anything, review has
+  confirmed that they indeed are no longer needed)
+- Drop using system libtool hack, this is dangerous when the libtool used
+  to generate ./configure and the one used differ
+- Remove various antique checks (for example check if RPM_BUILD_ROOT == /) 
+- Drop unnecessary explicit library Requires
+- Cleanup BuildRequires
+
 * Tue Mar 11 2008 Jindrich Novy <jnovy at redhat.com> - 1:1.2.0-1
 - update to 1.2.0
 - remove libcurl and oggdec patches, applied upstream


--- vorbis-tools-1.0-build.patch DELETED ---


--- vorbis-tools-1.0-curlconfig.patch DELETED ---