dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:42:41 +00:00 · 2009-11-26 01:14:31 +00:00 · 2009-06-18 10:00:17 +00:00 · 2009-05-03 12:13:40 +00:00 · 2009-04-15 06:50:43 +00:00
5 changed files with 13 additions and 25 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-unicap-0.9.3.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+unicap-0.9.5.tar.gz
--- a/21
+++ b/21
@ -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)
--- a/2
+++ b/2
@ -1 +1 @@
-69db7c7dacb58c303d44f3b6598653ee  unicap-0.9.3.tar.gz
+1d64005afac1ec9d75a1637d7f1aa91e  unicap-0.9.5.tar.gz
--- a/unicap.spec
+++ b/unicap.spec
@ -6,7 +6,7 @@

 Summary:	Library to access different kinds of (video) capture devices
 Name:		unicap
-Version:	0.9.3
+Version:	0.9.5
 Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
@ -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,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*

 %changelog
+* Thu Jun 18 2009 Dan Horak <dan[at]danny.cz> 0.9.5-2
+- don't require libraw1394 on s390/s390x
+
+* 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
Author	SHA1	Message	Date
Fedora Release Engineering	c455304337	dist-git conversion	2010-07-29 14:42:41 +00:00
Bill Nottingham	48438f6974	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:14:31 +00:00
Dan Horák	2815f84e40	- don't require libraw1394 on s390/s390x	2009-06-18 10:00:17 +00:00
Robert Scheck	4d144f58cb	Upgrade to 0.9.5	2009-05-03 12:13:40 +00:00
Jesse Keating	643cc7df7b	Initialize branch F-11 for unicap	2009-04-15 06:50:43 +00:00