new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7689 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -12,9 +12,11 @@
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	%{major_version}
+Version:	%{major_version}.1
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
+## prebuilt man pages
+Source10:	%{name}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz
 
 %if 0%{?_with_amr:1}
 License:        GPLv3+
@@ -107,6 +109,8 @@ This package contains development files for %{name}.
 %prep
 %setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
 
+%__tar -C %{_builddir} -xf %{SOURCE10} || exit 1
+
 %build
 %ifarch ppc
 # compile with -mlongcall on ppc/ppc64 (rf804)
@@ -182,7 +186,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 ## install man
 %__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
-#%__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+%__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %clean
@@ -201,11 +205,11 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %{_bindir}/ffprobe
 %{_bindir}/ffserver
 %{_bindir}/qt-faststart
-# %{?enable_avconv:%{_mandir}/man1/avconv.1*}
-# %{_mandir}/man1/ffmpeg.1*
-# %{_mandir}/man1/ffplay.1*
-# %{_mandir}/man1/ffprobe.1*
-# %{_mandir}/man1/ffserver.1*
+%{?enable_avconv:%{_mandir}/man1/avconv.1*}
+%{_mandir}/man1/ffmpeg.1*
+%{_mandir}/man1/ffplay.1*
+%{_mandir}/man1/ffprobe.1*
+%{_mandir}/man1/ffserver.1*
 %{_datadir}/ffmpeg
 
 
@@ -222,6 +226,11 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Wed May 22 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-1
+- new upstream release
+- added man pages
+  - added Source10: ffmpeg-1.2.1-doc.tar.xz
+
 * Thu Apr  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2-1
 - new upstream release
 

nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -7,7 +7,7 @@
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
 %global major_version 1.2
-%global version %{major_version}
+%global version %{major_version}.1
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -27,6 +27,9 @@ Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 #Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
+## prebuilt man pages
+Source10:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}-doc.tar.xz
+
 License:	GPLv2+
 Group:		Restricted Software
 
@@ -154,6 +157,7 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -190,6 +194,11 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Wed May 22 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.1-1
+- new upstream release
+- added man pages
+  - added Source10: ffmpeg-1.2.1-doc.tar.xz
+
 * Thu Apr  4 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2-1
 - new upstream release