From 3796d9ea9dbff410a570ceea25058d1a8ef8eaa8 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 May 2009 12:13:41 +0000 Subject: [PATCH 1/7] Upgrade to 0.9.5 --- .cvsignore | 2 +- sources | 2 +- unicap.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3da85a9..bb8ad2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz diff --git a/sources b/sources index a9728c9..6ae23c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz diff --git a/unicap.spec b/unicap.spec index 0a24460..7b431f0 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,8 +6,8 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + * Mon Feb 23 2009 Robert Scheck 0.9.3-2 - Rebuild against gcc 4.4 and rpm 4.6 From 22156e886d74d6240e35ce5a26b15ca5456797fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 18 Jun 2009 10:02:20 +0000 Subject: [PATCH 2/7] - don't require libraw1394 on s390/s390x --- unicap.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/unicap.spec b/unicap.spec index 7b431f0..eb0d219 100644 --- a/unicap.spec +++ b/unicap.spec @@ -7,7 +7,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -15,7 +15,10 @@ 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: libpng-devel, libX11-devel, libICE-devel +%ifnarch s390 s390x +BuildRequires: libraw1394-devel >= 1.1.0 +%endif BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel BuildRequires: libv4l-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Thu Jun 18 2009 Dan Horak 0.9.5-2 +- don't require libraw1394 on s390/s390x + * Sun May 03 2009 Robert Scheck 0.9.5-1 - Upgrade to 0.9.5 From 9ebe65914aa724ae2718de0bce7656deb2413937 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:32:18 +0000 Subject: [PATCH 3/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- unicap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unicap.spec b/unicap.spec index eb0d219..88c68c7 100644 --- a/unicap.spec +++ b/unicap.spec @@ -7,7 +7,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 0.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 18 2009 Dan Horak 0.9.5-2 - don't require libraw1394 on s390/s390x From 5de2323c2f0fbd4397f974905a2b6ecfb6a68ac2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:46 +0000 Subject: [PATCH 4/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 20fec0d..383f3ff 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: unicap -# $Id$ +# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e3e590532cf6aaebeffee449bfb5440f0f85d170 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 28 Mar 2010 13:58:47 +0000 Subject: [PATCH 5/7] Package unicap has been replaced on upstream level by libunicap, libucil and libunicapgtk. See also: https://bugzilla.redhat.com/show_bug.cgi?id=567109 https://bugzilla.redhat.com/show_bug.cgi?id=567110 https://bugzilla.redhat.com/show_bug.cgi?id=567111 --- .cvsignore | 1 - sources | 1 - unicap-filter.sh | 4 -- unicap.spec | 119 ----------------------------------------------- 4 files changed, 125 deletions(-) delete mode 100644 unicap-filter.sh delete mode 100644 unicap.spec diff --git a/.cvsignore b/.cvsignore index bb8ad2f..e69de29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +0,0 @@ -unicap-0.9.5.tar.gz diff --git a/sources b/sources index 6ae23c2..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz diff --git a/unicap-filter.sh b/unicap-filter.sh deleted file mode 100644 index 16860e6..0000000 --- a/unicap-filter.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/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' diff --git a/unicap.spec b/unicap.spec deleted file mode 100644 index 88c68c7..0000000 --- a/unicap.spec +++ /dev/null @@ -1,119 +0,0 @@ -%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.9.5 -Release: 3%{?dist} -License: GPLv2+ -Group: System Environment/Libraries -URL: http://www.unicap-imaging.org/ -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 -%ifnarch s390 s390x -BuildRequires: libraw1394-devel >= 1.1.0 -%endif -BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel -BuildRequires: libv4l-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%description -Unicap provides a uniform interface to video capture devices. It allows -applications to use any supported video capture device via a single API. -The included ucil library provides easy to use functions to render text -and graphic overlays onto video images. - -%package devel -Summary: Development files for the unicap library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig - -%description devel -The unicap-devel package includes header files and libraries necessary for -for developing programs which use the unicap, unicapgtk and ucil library. It -contains the API documentation of the library, too. - -%prep -%setup -q - -%build -%configure --disable-rpath --enable-gtk-doc --enable-libv4l - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# Don't install any static .a and libtool .la files -rm -f $RPM_BUILD_ROOT%{_libdir}/{,unicap2/cpi/}*.{a,la} - -%find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README -%{_libdir}/*.so.* -%{_libdir}/unicap2 - -%files devel -%defattr(-,root,root) -%doc examples -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_includedir}/%{name} -%{_datadir}/gtk-doc/html/* - -%changelog -* Sun Jul 26 2009 Fedora Release Engineering - 0.9.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 18 2009 Dan Horak 0.9.5-2 -- don't require libraw1394 on s390/s390x - -* Sun May 03 2009 Robert Scheck 0.9.5-1 -- Upgrade to 0.9.5 - -* Mon Feb 23 2009 Robert Scheck 0.9.3-2 -- Rebuild against gcc 4.4 and rpm 4.6 - -* Mon Oct 13 2008 Robert Scheck 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 0.2.23-4 -- Rebuild to get missing dependencies back (#443015, #458527) - -* Tue Aug 05 2008 Robert Scheck 0.2.23-3 -- Filter the unicap plugins which overlap with libv4l libraries - -* Wed Jul 22 2008 Robert Scheck 0.2.23-2 -- Rebuild for libraw1394 2.0.0 - -* Mon May 19 2008 Robert Scheck 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 0.2.22-1 -- Upgrade to 0.2.22 (#446021) - -* Sat Feb 16 2008 Robert Scheck 0.2.19-3 -- Added patch to correct libdir paths (thanks to Ralf Corsepius) - -* Mon Feb 04 2008 Robert Scheck 0.2.19-2 -- Changes to match with Fedora Packaging Guidelines (#431381) - -* Mon Feb 04 2008 Robert Scheck 0.2.19-1 -- Upgrade to 0.2.19 -- Initial spec file for Fedora and Red Hat Enterprise Linux From fc31443a3486182ca1d48026d7f407673e8bf317 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 8 Jul 2010 19:10:13 +0000 Subject: [PATCH 6/7] Package unicap has been replaced on upstream level by libunicap, libucil and libunicapgtk. See also: https://bugzilla.redhat.com/show_bug.cgi?id=567109 https://bugzilla.redhat.com/show_bug.cgi?id=567110 https://bugzilla.redhat.com/show_bug.cgi?id=567111 --- dead.package | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dead.package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..becd7d4 --- /dev/null +++ b/dead.package @@ -0,0 +1,5 @@ +Package unicap has been replaced on upstream level +by libunicap, libucil and libunicapgtk. See also: +https://bugzilla.redhat.com/show_bug.cgi?id=567109 +https://bugzilla.redhat.com/show_bug.cgi?id=567110 +https://bugzilla.redhat.com/show_bug.cgi?id=567111 From 23065682eee8fd9c2adcf673a1728bf430a3ffdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:42:37 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 383f3ff..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: unicap -# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ -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 $$d/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)