SPECS (AC-branch): xvidcap.spec - merged 1.1.4p1 from HEAD

[glen]

Author: glen                         Date: Fri Dec  8 17:44:06 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 1.1.4p1 from HEAD

---- Files affected:
SPECS:
   xvidcap.spec (1.13 -> 1.13.2.1) 

---- Diffs:

================================================================
Index: SPECS/xvidcap.spec
diff -u SPECS/xvidcap.spec:1.13 SPECS/xvidcap.spec:1.13.2.1
--- SPECS/xvidcap.spec:1.13	Wed Mar  1 00:37:25 2006
+++ SPECS/xvidcap.spec	Fri Dec  8 18:44:01 2006
@@ -1,16 +1,17 @@
 # $Revision$, $Date$
+# TODO: gnome docs
+#
 Summary:	XVidCap - Video Capture for X
 Summary(pl):	XVidCap - przechwytywanie obrazu dla X
 Name:		xvidcap
-Version:	1.1.4
+Version:	1.1.4p1
 Release:	1
+Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/xvidcap/%{name}-%{version}.tar.gz
-# Source0-md5:	b2db4f832f3597742e56fb4ff465e9a0
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-ffmpeg.patch
-Patch2:		%{name}-xt.patch
+# Source0-md5:	35a038dba807f6e09f1d9dd2bc0c5719
+Patch0:		%{name}-destdir.patch
 URL:		http://xvidcap.sourceforge.net/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -45,8 +46,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -54,30 +53,36 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-gtk2
+	--without-forced-embedded-ffmpeg
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_defaultdocdir}
+install -d $RPM_BUILD_ROOT{%{_docdir},%{_mandir}/man1}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-echo '.so xvidcap.1' > $RPM_BUILD_ROOT%{_mandir}/man1/gvidcap.1
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}_%{version}/INSTALL
-mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}_%{version} \
-	$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc %{_defaultdocdir}/%{name}-%{version}
+%doc ChangeLog README TODO.tasks
 %attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%dir %{_datadir}/%{name}
+%attr(755,root,root) %{_datadir}/%{name}/ppm2mpeg.sh
+%dir %{_datadir}/%{name}/glade
+%{_datadir}/%{name}/glade/gnome-xvidcap.glade
+%{_datadir}/%{name}/glade/xvidcap_logo.png
+%{_mandir}/man1/xvidcap.1*
+%lang(de) %{_mandir}/de/man1/xvidcap.1*
+%lang(es) %{_mandir}/es/man1/xvidcap.1*
+%lang(it) %{_mandir}/it/man1/xvidcap.1*
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -85,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13.2.1  2006/12/08 17:44:01  glen
+- merged 1.1.4p1 from HEAD
+
 Revision 1.13  2006/02/28 23:37:25  glen
 - adapterized (killed trailing spaces/tabs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xvidcap.spec?r1=1.13&r2=1.13.2.1&f=u