dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-unicap-0.2.19.tar.gz

.gitignore

@@ -0,0 +1 @@
+unicap-0.9.5.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: unicap
-# $Id$
-NAME := unicap
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-0ab0a533f5c1ff3a24853d2564ffb14f  unicap-0.2.19.tar.gz
+1d64005afac1ec9d75a1637d7f1aa91e  unicap-0.9.5.tar.gz

unicap-0.2.19-libdir.patch

@@ -1,87 +0,0 @@
-Patch by Ralf Corsepius <rc040203@freenet.de> for unicap >= 0.2.19, which causes the use
-of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used.
-
---- unicap-0.2.19/cpi/dcam/Makefile.am			2007-08-02 22:29:53.000000000 +0200
-+++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir		2008-02-05 11:35:57.000000000 +0100
-@@ -4,10 +4,10 @@
- if ENABLE_STATIC_CPI
- noinst_LTLIBRARIES = libdcam.la
- else
--lib_LTLIBRARIES = libdcam.la
-+libcpi_LTLIBRARIES = libdcam.la
- endif
- 
--libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
-+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
- 
- libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@
- 
---- unicap-0.2.19/cpi/thing/Makefile.am			2006-04-16 22:02:55.000000000 +0200
-+++ unicap-0.2.19/cpi/thing/Makefile.am.libdir		2008-02-05 11:36:58.000000000 +0100
-@@ -1,9 +1,9 @@
- MAINTAINERCLEANFILES = Makefile.in
- INCLUDES = -I../include -I../../include
- 
--lib_LTLIBRARIES = libthing.la
-+libcpi_LTLIBRARIES = libthing.la
- 
--libdir = $(prefix)/lib/unicap/cpi
-+libcpidir = $(libdir)/unicap/cpi
- 
- 
- libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
---- unicap-0.2.19/cpi/v4l/Makefile.am			2007-08-02 22:30:32.000000000 +0200
-+++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir		2008-02-05 11:37:23.000000000 +0100
-@@ -4,10 +4,10 @@
- if ENABLE_STATIC_CPI
- noinst_LTLIBRARIES = libv4l.la
- else
--lib_LTLIBRARIES = libv4l.la
-+libcpi_LTLIBRARIES = libv4l.la
- endif
- 
--libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
-+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
- 
- 
- libv4l_la_LDFLAGS = 
---- unicap-0.2.19/cpi/v4l2/Makefile.am			2008-02-02 16:07:46.000000000 +0100
-+++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir		2008-02-05 11:36:25.000000000 +0100
-@@ -4,10 +4,10 @@
- if ENABLE_STATIC_CPI
- noinst_LTLIBRARIES = libv4l2.la
- else
--lib_LTLIBRARIES = libv4l2.la
-+libcpi_LTLIBRARIES = libv4l2.la
- endif
- 
--libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
-+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
- 
- 
- libv4l2_la_LDFLAGS = 
---- unicap-0.2.19/cpi/vid21394/Makefile.am		2007-08-02 22:29:34.000000000 +0200
-+++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir	2008-02-05 11:38:19.000000000 +0100
-@@ -4,10 +4,10 @@
- if ENABLE_STATIC_CPI
- noinst_LTLIBRARIES = libvid21394.la
- else
--lib_LTLIBRARIES = libvid21394.la
-+libcpi_LTLIBRARIES = libvid21394.la
- endif
- 
--libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
-+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
- 
- libvid21394_la_LDFLAGS = 
- 
---- unicap-0.2.19/libunicapgtk/Makefile.am		2007-08-30 07:55:42.000000000 +0200
-+++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir	2008-02-05 11:39:08.000000000 +0100
-@@ -1,6 +1,6 @@
- MAINTAINERCLEANFILES = Makefile.in
- INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@ 
--AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\""
-+AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\""
- 
- if BUILD_UNICAPGTK
- UNICAPGTK_LIB=libunicapgtk.la

unicap-filter.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# The original script name has been passed as the first argument:
+"$@" | sed -e '/^libdcam.so/d' -e '/^libv4l.so/d' -e '/^libv4l2.so/d' -e '/^libvid21394.so/d'

unicap.spec

@@ -1,17 +1,22 @@
+%define _use_internal_dependency_generator 0
+%{expand:%%define prev__find_provides %{__find_provides}}
+%define __find_provides sh %{SOURCE1} %{prev__find_provides}
+%{expand:%%define prev__find_requires %{__find_requires}}
+%define __find_requires sh %{SOURCE1} %{prev__find_requires}
+
 Summary:	Library to access different kinds of (video) capture devices
 Name:		unicap
-Version:	0.2.19
-Release:	3%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.unicap-imaging.org/
-Source:		http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
-Patch:		unicap-0.2.19-libdir.patch
-BuildRequires:	intltool, /usr/bin/perl, perl(XML::Parser), gettext
+Source0:	http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
+Source1:	unicap-filter.sh
+BuildRequires:	intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4
 BuildRequires:	glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel
 BuildRequires:	libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0
 BuildRequires:	libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel
-BuildRequires:	automake, libtool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -32,10 +37,6 @@ contains the API documentation of the library, too.
 
 %prep
 %setup -q
-%patch -p1 -b .libdir
-aclocal -I m4
-autoconf
-automake -a
 
 %build
 %configure --disable-rpath --enable-gtk-doc
@@ -60,20 +61,43 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/*.so.*
-%dir %{_libdir}/unicap2
-%dir %{_libdir}/unicap2/cpi
-%{_libdir}/unicap2/cpi/*.so.*
+%{_libdir}/unicap2
 
 %files devel
 %defattr(-,root,root)
 %doc examples
 %{_libdir}/*.so
-%{_libdir}/unicap2/cpi/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/%{name}
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun May 03 2009 Robert Scheck <robert@fedoraproject.org> 0.9.5-1
+- Upgrade to 0.9.5
+
+* Mon Feb 23 2009 Robert Scheck <robert@fedoraproject.org> 0.9.3-2
+- Rebuild against gcc 4.4 and rpm 4.6
+
+* Mon Oct 13 2008 Robert Scheck <robert@fedoraproject.org> 0.9.3-1
+- Upgrade to 0.9.3 (#466825, thanks to Hans de Goede)
+- Enabled libv4l support for the new gspca kernel driver
+
+* Sat Aug 09 2008 Robert Scheck <robert@fedoraproject.org> 0.2.23-4
+- Rebuild to get missing dependencies back (#443015, #458527)
+
+* Tue Aug 05 2008 Robert Scheck <robert@fedoraproject.org> 0.2.23-3
+- Filter the unicap plugins which overlap with libv4l libraries
+
+* Wed Jul 22 2008 Robert Scheck <robert@fedoraproject.org> 0.2.23-2
+- Rebuild for libraw1394 2.0.0
+
+* Mon May 19 2008 Robert Scheck <robert@fedoraproject.org> 0.2.23-1
+- Upgrade to 0.2.23
+- Corrected packaging of cpi/*.so files (thanks to Arne Caspari)
+
+* Sat May 17 2008 Robert Scheck <robert@fedoraproject.org> 0.2.22-1
+- Upgrade to 0.2.22 (#446021)
+
 * Sat Feb 16 2008 Robert Scheck <robert@fedoraproject.org> 0.2.19-3
 - Added patch to correct libdir paths (thanks to Ralf Corsepius)