Author: kwizart Update of /cvs/free/rpms/streamripper/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25310 Modified Files: streamripper.spec Log Message: * Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild Index: streamripper.spec =================================================================== RCS file: /cvs/free/rpms/streamripper/devel/streamripper.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- streamripper.spec 1 May 2009 10:29:12 -0000 1.4 +++ streamripper.spec 25 Jan 2012 14:53:57 -0000 1.5 @@ -1,18 +1,26 @@ Summary: Shoutcast and icecast compatible streams recorder Name: streamripper Version: 1.64.6 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia URL: http://streamripper.sourceforge.net/ License: GPLv2 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel +<<<<<<< streamripper.spec +BuildRequires: libvorbis-devel +BuildRequires: libmad-devel +BuildRequires: tre-devel +BuildRequires: faad2-devel +BuildRequires: glib2-devel >= 2.16 +======= BuildRequires: libvorbis-devel BuildRequires: libmad-devel BuildRequires: tre-devel BuildRequires: faad2-devel BuildRequires: glib2-devel >= 2.6 +>>>>>>> 1.4 %description @@ -26,6 +34,10 @@ %prep %setup -q +<<<<<<< streamripper.spec + +======= +>>>>>>> 1.4 chmod 0644 ./lib/charset.h %build @@ -40,6 +52,10 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p -c" +<<<<<<< streamripper.spec + +======= +>>>>>>> 1.4 %files %defattr(-,root,root,-) @@ -51,9 +67,18 @@ rm -rf %{buildroot} %changelog +* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +<<<<<<< streamripper.spec +* Thu Apr 30 2009 kwizart < kwizart at gmail.com > - 1.64.6-1 +- Update to 1.64.6 + +======= * Thu Apr 30 2009 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.64.6-1 - Update release. +>>>>>>> 1.4 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.63.5-3 - rebuild for new F11 features