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 d9ec8d4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: videodog -# $Id$ -NAME := videodog -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) diff --git a/videodog.spec b/videodog.spec index cb07643..c2ba952 100644 --- a/videodog.spec +++ b/videodog.spec @@ -1,10 +1,10 @@ Name: videodog Version: 0.31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command-line video4linux frame-grabber Group: Applications/Multimedia -License: LGPL +License: LGPLv2+ URL: http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog.html Source0: http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 21 2007 Patrick "Jima" Laughton 0.31-5 +- License clarification + * Mon Aug 28 2006 Patrick "Jima" Laughton 0.31-4 - Rebuild for FC6