From f805f545493569f11119b45dd3a6cabdcf16bdd8 Mon Sep 17 00:00:00 2001 From: Ian Weller Date: Jan 15 2009 03:12:59 +0000 Subject: importing ezstream-0.5.3-2 in devel --- diff --git a/ezstream-stop-weird-installs.patch b/ezstream-stop-weird-installs.patch deleted file mode 100644 index ccbf9c0..0000000 --- a/ezstream-stop-weird-installs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up ezstream-0.5.3/Makefile.in.orig ezstream-0.5.3/Makefile.in ---- ezstream-0.5.3/Makefile.in.orig 2008-04-05 18:08:42.000000000 -0500 -+++ ezstream-0.5.3/Makefile.in 2008-04-05 18:08:50.000000000 -0500 -@@ -200,7 +200,7 @@ target_alias = @target_alias@ - AUTOMAKE_OPTIONS = 1.9 foreign - ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = build-aux compat doc examples m4 src win32 --dist_doc_DATA = COPYING NEWS README -+dist_doc_DATA = - CLEANFILES = core *.core *~ .*~ - all: all-recursive - -diff -up ezstream-0.5.3/examples/Makefile.in.orig ezstream-0.5.3/examples/Makefile.in ---- ezstream-0.5.3/examples/Makefile.in.orig 2008-04-05 18:02:44.000000000 -0500 -+++ ezstream-0.5.3/examples/Makefile.in 2008-04-05 18:03:06.000000000 -0500 -@@ -181,12 +181,9 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = 1.9 foreign - examplesdir = @EXAMPLES_DIR@ --dist_examples_DATA = ezstream_mp3.xml ezstream_reencode_mp3.xml \ -- ezstream_reencode_theora.xml ezstream_reencode_vorbis.xml \ -- ezstream_stdin_vorbis.xml ezstream_vorbis.xml \ -- ezstream_metadata.xml -+dist_examples_DATA = - --dist_examples_SCRIPTS = meta.sh play.sh -+dist_examples_SCRIPTS = - CLEANFILES = core *.core *~ .*~ - all: all-am - diff --git a/ezstream.spec b/ezstream.spec index 65f171f..9c11585 100644 --- a/ezstream.spec +++ b/ezstream.spec @@ -1,14 +1,12 @@ Name: ezstream Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line source client for Icecast media streaming servers Group: Applications/Multimedia License: GPLv2 URL: http://www.icecast.org/ezstream.php Source0: http://downloads.xiph.org/releases/ezstream/ezstream-%{version}.tar.gz -# Patch0 gets rid of the unnecessary installation of documentation that we do ourselves anyway. -Patch0: ezstream-stop-weird-installs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel libvorbis-devel taglib-devel libshout-devel libxml2-devel @@ -30,9 +28,13 @@ Native metadata support includes MP3 (ID3v1 only) and Ogg Vorbis, and many more formats when the optional TagLib support has been compiled in (which they are for this package). + %prep %setup -q -%patch0 -p1 -b .stop_weird_inst +mkdir __examples +cp -a examples __examples/examples +rm -f __examples/examples/Makefile* +chmod a-x __examples/examples/* %build @@ -43,8 +45,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# spurious executable doc -chmod a-x examples/* +rm -rf $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_datadir}/examples %clean @@ -54,16 +55,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ezstream -# Why are we specifying each example instead of just adding the directory? -# If we do that, we get the Makefile stuff too, which is silly. -%doc COPYING NEWS README examples/ezstream_metadata.xml examples/ezstream_mp3.xml -%doc examples/ezstream_reencode_mp3.xml examples/ezstream_reencode_theora.xml -%doc examples/ezstream_reencode_vorbis.xml examples/ezstream_stdin_vorbis.xml -%doc examples/ezstream_vorbis.xml examples/meta.sh examples/play.sh -%doc %{_mandir}/man1/ezstream.1.gz - +%doc COPYING NEWS README __examples/examples +%{_mandir}/man1/ezstream.1.gz %changelog +* Wed Jan 14 2009 Ian Weller 0.5.3-2 +- Remove doc declaration from the man page +- Move examples into examples/ within the docdir +- Remove need for patch and put commands in the right parts + * Sat Apr 05 2008 Ian Weller 0.5.3-1 - Initial package build. diff --git a/import.log b/import.log new file mode 100644 index 0000000..931189a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ezstream-0_5_3-2_fc10:HEAD:ezstream-0.5.3-2.fc10.src.rpm:1231989152