rpms/ezstream/F-9 import.log, NONE, 1.1 ezstream.spec, 1.1, 1.2 ezstream-stop-weird-installs.patch, 1.1, NONE

[Ian Weller]

Author: ianweller

Update of /cvs/pkgs/rpms/ezstream/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21641/F-9

Modified Files:
	ezstream.spec 
Added Files:
	import.log 
Removed Files:
	ezstream-stop-weird-installs.patch 
Log Message:
importing ezstream-0.5.3-2 in F-9


--- NEW FILE import.log ---
ezstream-0_5_3-2_fc10:F-9:ezstream-0.5.3-2.fc10.src.rpm:1231990482


Index: ezstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ezstream/F-9/ezstream.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ezstream.spec	17 May 2008 17:17:30 -0000	1.1
+++ ezstream.spec	15 Jan 2009 03:35:14 -0000	1.2
@@ -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 @@
 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 @@
 %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 @@
 %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 <ianweller at gmail.com> 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 <ianweller at gmail.com> 0.5.3-1
 - Initial package build.


--- ezstream-stop-weird-installs.patch DELETED ---