From 643cc7df7b9b42c666b38730f0e14f2d65f7d577 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:50:43 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for unicap --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 4d144f58cb4867d6dbb232d536d6f682cf4ef219 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 May 2009 12:13:40 +0000 Subject: [PATCH 2/5] 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 2815f84e40ec0114a6719caf37fba02d18ef9063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 18 Jun 2009 10:00:17 +0000 Subject: [PATCH 3/5] - 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 48438f6974dcc6a92afef3f30942ff86dacd0275 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:31 +0000 Subject: [PATCH 4/5] 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 c455304337ab109d73f151c0f816fab3d898e161 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:42:41 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11