From 402b0ecefd0c020671ea934160d35fecb2a30266 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 10:52:50 +0000 Subject: [PATCH 01/12] Initialize branch F-7 for v4l2-tool --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 151f6fa62369891dd42d63a4252b11b0489c1498 Mon Sep 17 00:00:00 2001 From: paragn Date: Tue, 21 Aug 2007 15:32:53 +0000 Subject: [PATCH 02/12] update License tag and build against new rpm package --- v4l2-tool.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/v4l2-tool.spec b/v4l2-tool.spec index 5eee94a..3d7a69c 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,10 +1,10 @@ Name: v4l2-tool Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia -License: GPL +License: GPLv2 URL: http://www.sourceforge.net/ Source0: http://jaist.dl.sourceforge.net/sourceforge/v4lx-devinfo/%{name}-%{version}.tar.gz Patch0: db.patch @@ -72,6 +72,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/* %changelog +* Tue Aug 21 2007 Parag Nemade - 1.0.2-3 +- update License tag +- build against new rpm package + * Thu Nov 30 2006 Parag Nemade 1.0.2-2 - Fixed Desktop file, Source URL, Added COPYING under %%doc From 5fdbb4a950846189ecbd9dddff8fc26f62dc6650 Mon Sep 17 00:00:00 2001 From: paragn Date: Tue, 28 Aug 2007 17:29:27 +0000 Subject: [PATCH 03/12] Update to new upstream release 1.0.3 --- .cvsignore | 1 + db.patch | 10 +++++----- sources | 1 + v4l2-tool.spec | 9 ++++++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 12eb2dc..d3b58d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ v4l2-tool-1.0.2.tar.gz +v4l2-tool-1.0.3.tar.gz diff --git a/db.patch b/db.patch index 1c21a88..f70bfe5 100644 --- a/db.patch +++ b/db.patch @@ -1,6 +1,6 @@ -diff -urN v4l2-tool-1.0.2/src/interface.c v4l2-tool-1.0.2-patched/src/interface.c ---- v4l2-tool-1.0.2/src/interface.c 2006-09-28 16:45:20.000000000 +0530 -+++ v4l2-tool-1.0.2-patched/src/interface.c 2006-10-03 15:17:02.000000000 +0530 +diff -urN v4l2-tool-1.0.3/src/interface.c v4l2-tool-1.0.3-patched/src/interface.c +--- v4l2-tool-1.0.3/src/interface.c 2007-08-28 11:25:20.000000000 +0530 ++++ v4l2-tool-1.0.3-patched/src/interface.c 2007-08-28 12:37:02.000000000 +0530 @@ -274,7 +274,7 @@ } strncat(srch1,gtxt,6); @@ -14,8 +14,8 @@ diff -urN v4l2-tool-1.0.2/src/interface.c v4l2-tool-1.0.2-patched/src/interface. } } fclose (fp); -- fp = fopen("gspca.txt", "r"); -+ fp = fopen("/usr/share/v4l2-tool/gspca.txt", "r"); +- fp = fopen("gspcav2.txt", "r"); ++ fp = fopen("/usr/share/v4l2-tool/gspcav2.txt", "r"); if (fp == NULL) exit(0); while ((r_read = getline(&line, &len, fp)) != -1) { diff --git a/sources b/sources index ea035f4..da853b6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 89891d3f36e4e9851d3b2dc87974e334 v4l2-tool-1.0.2.tar.gz +73a91e0252b6955a84b59c5cd6e6ce15 v4l2-tool-1.0.3.tar.gz diff --git a/v4l2-tool.spec b/v4l2-tool.spec index 3d7a69c..b298b7d 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,6 +1,6 @@ Name: v4l2-tool -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia @@ -34,7 +34,7 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/%{name} install -m 644 src/uvcvideo.txt %{buildroot}%{_datadir}/%{name}/uvcvideo.txt -install -m 644 src/gspca.txt %{buildroot}%{_datadir}/%{name}/gspca.txt +install -m 644 src/gspcav2.txt %{buildroot}%{_datadir}/%{name}/gspcav2.txt mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -p -m 644 v4l2-tool-logo.png %{buildroot}%{_datadir}/pixmaps/v4l2-tool-logo.png @@ -72,6 +72,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/* %changelog +* Tue Aug 28 2007 Parag Nemade - 1.0.3-1 +- update to new upstream release + * Tue Aug 21 2007 Parag Nemade - 1.0.2-3 - update License tag - build against new rpm package From 9766d3d57668816c349fef3ec06bf721881617cd Mon Sep 17 00:00:00 2001 From: paragn Date: Sat, 9 Feb 2008 16:10:01 +0000 Subject: [PATCH 04/12] - Rebuild for gcc 4.3 --- sources | 1 - v4l2-tool.spec | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sources b/sources index da853b6..7e539ab 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -89891d3f36e4e9851d3b2dc87974e334 v4l2-tool-1.0.2.tar.gz 73a91e0252b6955a84b59c5cd6e6ce15 v4l2-tool-1.0.3.tar.gz diff --git a/v4l2-tool.spec b/v4l2-tool.spec index b298b7d..fa77cfb 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,12 +1,12 @@ Name: v4l2-tool Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia License: GPLv2 -URL: http://www.sourceforge.net/ -Source0: http://jaist.dl.sourceforge.net/sourceforge/v4lx-devinfo/%{name}-%{version}.tar.gz +URL: http://v4lx-devinfo.sf.net/ +Source0: http://downloads.sourceforge.net/v4lx-devinfo/%{name}-%{version}.tar.gz Patch0: db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils libgnomeui-devel @@ -33,8 +33,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/%{name} -install -m 644 src/uvcvideo.txt %{buildroot}%{_datadir}/%{name}/uvcvideo.txt -install -m 644 src/gspcav2.txt %{buildroot}%{_datadir}/%{name}/gspcav2.txt +install -p -m 644 src/uvcvideo.txt %{buildroot}%{_datadir}/%{name}/uvcvideo.txt +install -p -m 644 src/gspcav2.txt %{buildroot}%{_datadir}/%{name}/gspcav2.txt mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -p -m 644 v4l2-tool-logo.png %{buildroot}%{_datadir}/pixmaps/v4l2-tool-logo.png @@ -58,20 +58,19 @@ desktop-file-install --vendor fedora \ %clean rm -rf %{buildroot} -%post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - -%postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %files -%defattr(-, root, root) +%defattr(-, root, root, -) %doc COPYING AUTHORS ChangeLog README %{_bindir}/v4l2-tool -%{_datadir}/* +%{_datadir}/pixmaps/v4l2-tool* +%{_datadir}/v4l2-tool +%{_datadir}/applications/fedora-v4l2-tool.desktop %changelog +* Sat Feb 09 2008 Parag Nemade - 1.0.3-2 +- Rebuild for gcc 4.3 + * Tue Aug 28 2007 Parag Nemade - 1.0.3-1 - update to new upstream release From acd6a05429c538583d72cf565d7afb72f0320427 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:42:38 +0000 Subject: [PATCH 05/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- v4l2-tool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v4l2-tool.spec b/v4l2-tool.spec index fa77cfb..c905acb 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,6 +1,6 @@ Name: v4l2-tool Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/applications/fedora-v4l2-tool.desktop %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 09 2008 Parag Nemade - 1.0.3-2 - Rebuild for gcc 4.3 From 4da9f46a99fba5ac1254a9c79459097f23e991c4 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:42:24 +0000 Subject: [PATCH 06/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- v4l2-tool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v4l2-tool.spec b/v4l2-tool.spec index c905acb..77b03cf 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,6 +1,6 @@ Name: v4l2-tool Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/applications/fedora-v4l2-tool.desktop %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 39c6ec51ba4d72cc3cbc3cf97d863281976e7b0b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 20 Sep 2009 11:17:37 +0000 Subject: [PATCH 07/12] - Correct path to lsusb --- v4l2-tool-1.0.3-lsusb.patch | 15 +++++++++++++++ v4l2-tool.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 v4l2-tool-1.0.3-lsusb.patch diff --git a/v4l2-tool-1.0.3-lsusb.patch b/v4l2-tool-1.0.3-lsusb.patch new file mode 100644 index 0000000..44a975d --- /dev/null +++ b/v4l2-tool-1.0.3-lsusb.patch @@ -0,0 +1,15 @@ +Correct path to lsusb +Lubomir Rintel + +diff -up v4l2-tool-1.0.3/src/interface.c.lsusb v4l2-tool-1.0.3/src/interface.c +--- v4l2-tool-1.0.3/src/interface.c.lsusb 2009-09-20 13:15:56.199876752 +0200 ++++ v4l2-tool-1.0.3/src/interface.c 2009-09-20 13:15:56.234996207 +0200 +@@ -206,7 +206,7 @@ on_lsusb_button_clicked ( + char *fileName="/tmp/usbfile"; + gchar *text; gsize length; + +- rread=system("/sbin/lsusb | grep -v 0000 > /tmp/usbfile"); ++ rread=system("/usr/sbin/lsusb | grep -v 0000 > /tmp/usbfile"); + lsusbwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_policy(GTK_WINDOW(lsusbwindow), FALSE, TRUE, TRUE); + gtk_window_set_title (GTK_WINDOW(lsusbwindow), _("lsusb - USB Device Information")); diff --git a/v4l2-tool.spec b/v4l2-tool.spec index 77b03cf..c560350 100644 --- a/v4l2-tool.spec +++ b/v4l2-tool.spec @@ -1,6 +1,6 @@ Name: v4l2-tool Version: 1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: This package gives v4l2 device information of webcam Group: Applications/Multimedia @@ -8,6 +8,7 @@ License: GPLv2 URL: http://v4lx-devinfo.sf.net/ Source0: http://downloads.sourceforge.net/v4lx-devinfo/%{name}-%{version}.tar.gz Patch0: db.patch +Patch1: v4l2-tool-1.0.3-lsusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils libgnomeui-devel BuildRequires: automake @@ -23,6 +24,7 @@ ioctl call and returning respective structure fills with values. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .db +%patch1 -p1 -b .lsusb %build sh autogen.sh @@ -68,6 +70,9 @@ rm -rf %{buildroot} %{_datadir}/applications/fedora-v4l2-tool.desktop %changelog +* Sun Sep 20 2009 Lubomir Rintel - 1.0.3-5 +- Correct path to lsusb + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 3af4892e692681bc22c41e0fee8ea93fd193ede4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:18 +0000 Subject: [PATCH 08/12] 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 878769a..1898aa9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: v4l2-tool -# $Id$ +# $Id: Makefile,v 1.1 2006/12/05 04:17:46 paragn Exp $ NAME := v4l2-tool 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 3c8589f46fd0f9a7d31dd9e902c20005a786192d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:35 +0000 Subject: [PATCH 09/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 878769a..9475938 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := v4l2-tool 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 0f5d79f392f6713e4f658daf9eb6003db83d7732 Mon Sep 17 00:00:00 2001 From: paragn Date: Sat, 5 Dec 2009 15:21:59 +0000 Subject: [PATCH 10/12] - No updates from upstream and development is dead. --- Makefile | 21 -------- db.patch | 21 -------- dead.package | 0 sources | 1 - v4l2-tool-1.0.3-lsusb.patch | 15 ------ v4l2-tool.spec | 97 ------------------------------------- 6 files changed, 155 deletions(-) delete mode 100644 Makefile delete mode 100644 db.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 v4l2-tool-1.0.3-lsusb.patch delete mode 100644 v4l2-tool.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 1898aa9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: v4l2-tool -# $Id: Makefile,v 1.1 2006/12/05 04:17:46 paragn Exp $ -NAME := v4l2-tool -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/db.patch b/db.patch deleted file mode 100644 index f70bfe5..0000000 --- a/db.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN v4l2-tool-1.0.3/src/interface.c v4l2-tool-1.0.3-patched/src/interface.c ---- v4l2-tool-1.0.3/src/interface.c 2007-08-28 11:25:20.000000000 +0530 -+++ v4l2-tool-1.0.3-patched/src/interface.c 2007-08-28 12:37:02.000000000 +0530 -@@ -274,7 +274,7 @@ - } - strncat(srch1,gtxt,6); - -- fp = fopen("uvcvideo.txt", "r"); -+ fp = fopen("/usr/share/v4l2-tool/uvcvideo.txt", "r"); - if (fp == NULL) - exit(0); - while ((r_read = getline(&line, &len, fp)) != -1) { -@@ -286,7 +286,7 @@ - } - } - fclose (fp); -- fp = fopen("gspcav2.txt", "r"); -+ fp = fopen("/usr/share/v4l2-tool/gspcav2.txt", "r"); - if (fp == NULL) - exit(0); - while ((r_read = getline(&line, &len, fp)) != -1) { diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources deleted file mode 100644 index 7e539ab..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -73a91e0252b6955a84b59c5cd6e6ce15 v4l2-tool-1.0.3.tar.gz diff --git a/v4l2-tool-1.0.3-lsusb.patch b/v4l2-tool-1.0.3-lsusb.patch deleted file mode 100644 index 44a975d..0000000 --- a/v4l2-tool-1.0.3-lsusb.patch +++ /dev/null @@ -1,15 +0,0 @@ -Correct path to lsusb -Lubomir Rintel - -diff -up v4l2-tool-1.0.3/src/interface.c.lsusb v4l2-tool-1.0.3/src/interface.c ---- v4l2-tool-1.0.3/src/interface.c.lsusb 2009-09-20 13:15:56.199876752 +0200 -+++ v4l2-tool-1.0.3/src/interface.c 2009-09-20 13:15:56.234996207 +0200 -@@ -206,7 +206,7 @@ on_lsusb_button_clicked ( - char *fileName="/tmp/usbfile"; - gchar *text; gsize length; - -- rread=system("/sbin/lsusb | grep -v 0000 > /tmp/usbfile"); -+ rread=system("/usr/sbin/lsusb | grep -v 0000 > /tmp/usbfile"); - lsusbwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_policy(GTK_WINDOW(lsusbwindow), FALSE, TRUE, TRUE); - gtk_window_set_title (GTK_WINDOW(lsusbwindow), _("lsusb - USB Device Information")); diff --git a/v4l2-tool.spec b/v4l2-tool.spec deleted file mode 100644 index c560350..0000000 --- a/v4l2-tool.spec +++ /dev/null @@ -1,97 +0,0 @@ -Name: v4l2-tool -Version: 1.0.3 -Release: 5%{?dist} -Summary: This package gives v4l2 device information of webcam - -Group: Applications/Multimedia -License: GPLv2 -URL: http://v4lx-devinfo.sf.net/ -Source0: http://downloads.sourceforge.net/v4lx-devinfo/%{name}-%{version}.tar.gz -Patch0: db.patch -Patch1: v4l2-tool-1.0.3-lsusb.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils libgnomeui-devel -BuildRequires: automake - -%description -This package gives v4l2 device information of webcam. This -application is used to get more hardware information from attached -webcam device. This application is tested with gspca and uvcvideo -v4l2 kernel drivers. There are five tabs each corresponding to one -ioctl call and returning respective structure fills with values. - - -%prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .db -%patch1 -p1 -b .lsusb - -%build -sh autogen.sh -%configure -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}%{_datadir}/%{name} -install -p -m 644 src/uvcvideo.txt %{buildroot}%{_datadir}/%{name}/uvcvideo.txt -install -p -m 644 src/gspcav2.txt %{buildroot}%{_datadir}/%{name}/gspcav2.txt -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -p -m 644 v4l2-tool-logo.png %{buildroot}%{_datadir}/pixmaps/v4l2-tool-logo.png - -cat << EOF > %{name}.desktop -[Desktop Entry] -Name=v4l2-tool -Comment=Gives webcam details using v4l2 kernel driver -Exec=v4l2-tool -Icon=v4l2-tool-logo -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=GNOME;Application;AudioVideo;Video; -EOF - -desktop-file-install --vendor fedora \ - --dir %{buildroot}/%{_datadir}/applications/ \ - %{name}.desktop - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-, root, root, -) -%doc COPYING AUTHORS ChangeLog README -%{_bindir}/v4l2-tool -%{_datadir}/pixmaps/v4l2-tool* -%{_datadir}/v4l2-tool -%{_datadir}/applications/fedora-v4l2-tool.desktop - -%changelog -* Sun Sep 20 2009 Lubomir Rintel - 1.0.3-5 -- Correct path to lsusb - -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 09 2008 Parag Nemade - 1.0.3-2 -- Rebuild for gcc 4.3 - -* Tue Aug 28 2007 Parag Nemade - 1.0.3-1 -- update to new upstream release - -* Tue Aug 21 2007 Parag Nemade - 1.0.2-3 -- update License tag -- build against new rpm package - -* Thu Nov 30 2006 Parag Nemade 1.0.2-2 -- Fixed Desktop file, Source URL, Added COPYING under %%doc - -* Sat Aug 26 2006 Parag Nemade 1.0.2-1 -- Initial specfile for Fedora Extras - From 05a37cb6bf53ed9aaff7a3344343e4b7d125d524 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:51:55 +0000 Subject: [PATCH 11/12] 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 9475938..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: v4l2-tool -# $Id$ -NAME := v4l2-tool -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From 711d0573203cf92039a7d66e9bc0f0173b4d3b81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:51:57 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore