new upstream release

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

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8-unix -*-
 Name:           mjpegtools
-Version:        1.9.0
+Version:        2.0.0
 Release:        1%{?_dist_release}
 Summary:        Tools to manipulate MPEG data
 Summary(ja):    MPEG データを操作するツール集
@@ -9,11 +9,13 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://mjpeg.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-Patch0:         mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch
-Patch1:         mjpegtools-1.9.0-gcc44.patch
-Patch2:         mjpegtools-1.9.0-png-memleak.patch
+Patch0:         mjpegtools-2.0.0-no-config-in-public-header.h
+Patch1:         mjpegtools_gcc470.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+Obsoletes:      mjpegtools < %{version}, mjpegtools-devel < %{version}
+
 BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  libdv-devel
@@ -37,14 +39,12 @@ Requires(preun): /sbin/install-info
 %description
 The mjpeg programs are a set of tools that can do recording of videos
 and playback, simple cut-and-paste editing and the MPEG compression of
-audio and video under Linux. 
+audio and video under Linux.  
 
 %description -l ja
-mjpegtools は、Linux 上で
-ビデオ録画や再生、
-簡単なカット＆ペーストの編集、
-オーディオやビデオの MPEG 圧縮
-ができるツール集です。
+mjpegtools は、Linux 上でビデオ録画や再生、
+簡単なカット＆ペーストの編集、オーディオやビデオの MPEG 圧縮ができる
+ツール集です。
 
 %package        devel
 Summary:        Development files for mjpegtools libraries 
@@ -63,7 +63,7 @@ for building applications that use mjpegtools libraries.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 %__sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
 %__sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
 for f in docs/yuvfps.1 ; do
@@ -109,15 +109,15 @@ done
 %{_infodir}/mjpeg-howto.info*
 ## gui
 %doc README.glav
-%{_bindir}/glav
+#%{_bindir}/glav
 # lavplay and yuvplay won't save -libs/console util users from X11 and SDL
 # dependencies as long as liblavplay is in -libs, but they're inherently
 # GUI tools -> include them here
-%{_bindir}/lavplay
-%{_bindir}/y4mhist
-%{_bindir}/yuvplay
-%{_mandir}/man1/lavplay.1*
-%{_mandir}/man1/yuvplay.1*
+#%{_bindir}/lavplay
+#%{_bindir}/y4mhist
+#%{_bindir}/yuvplay
+#%{_mandir}/man1/lavplay.1*
+#%{_mandir}/man1/yuvplay.1*
 ## libs
 %{_libdir}/lib*.so.*
 
@@ -129,6 +129,9 @@ done
 
 
 %changelog
+* Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-1
+- new upstream release
+
 * Fri Sep 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.0-1
 - new upstream release
 

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

@@ -1,6 +1,6 @@
 %define pkgname mjpegtools
 %define name    self-build-%{pkgname}
-%define version 1.9.0
+%define version 2.0.0
 %define release 1%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/mjpeg/%{pkgname}-%{version}.tar.gz
@@ -12,13 +12,15 @@ Version:	%{version}
 Release: 	%{release}
 
 Source0:	%{pkgname}-vl.spec
-Source100:      mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch
-Source101:      mjpegtools-1.9.0-gcc44.patch
-Source102:      mjpegtools-1.9.0-png-memleak.patch
+Source100:      mjpegtools-2.0.0-no-config-in-public-header.h
+Source101:      mjpegtools_gcc470.patch
 
 License:	GPLv2+
 Group:		Restricted Software
 
+Obsoletes:      mjpegtools < %{version}, mjpegtools-devel < %{version}
+Obsoletes:      self-build-mjpegtools < %{version}-%{release}
+
 # Requires(posttrans) not yet implemented. So we use (post) instead.
 Requires(post):	self-build-setup >= 0.9.0
 
@@ -116,8 +118,7 @@ mjpegtools は、Linux 上で
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 \
-    %{SOURCE100} %{SOURCE101} %{SOURCE102} \
+%{__install} -m 644 %{SOURCE100} %{SOURCE101}  \
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
@@ -135,6 +136,9 @@ mjpegtools は、Linux 上で
 
 
 %changelog
+* Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.0-1
+- new upstream release
+
 * Fri Sep 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.0-1
 - initial build