From 8c964cdeb857fada604c3cdaaa2fb47eb237b633 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 May 2008 16:26:52 +0000 Subject: [PATCH 1/9] Initialize branch F-8 for ucview --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 887835c23fdc526dc25b350e37178faa2bdb927e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 19:19:16 +0000 Subject: [PATCH 2/9] Initial import of ucview --- .cvsignore | 2 ++ sources | 2 ++ ucview.spec | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 ucview.spec diff --git a/.cvsignore b/.cvsignore index e69de29..0893b27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +ucview-0.17.tar.gz +ucview.desktop diff --git a/sources b/sources index e69de29..266aa33 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +e241951a418db9bd66d8da612af15328 ucview-0.17.tar.gz +6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop diff --git a/ucview.spec b/ucview.spec new file mode 100644 index 0000000..cb164e9 --- /dev/null +++ b/ucview.spec @@ -0,0 +1,96 @@ +Summary: Image and video capture application using unicap toolkit +Name: ucview +Version: 0.17 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/Multimedia +URL: http://www.unicap-imaging.org/ +Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Source1: %{name}.desktop +BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext +BuildRequires: unicap-devel >= 0.2.2, gtk2-devel >= 2.8.0, libglade2-devel +BuildRequires: dbus-glib-devel, glib2-devel, GConf2-devel, libXv-devel +BuildRequires: libtheora-devel, libvorbis-devel, desktop-file-utils +Requires: hicolor-icon-theme +Requires(pre): GConf2 +Requires(post): GConf2, scrollkeeper +Requires(preun): GConf2 +Requires(postun): scrollkeeper +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +UCView is a video image capture application using the unicap toolkit. +It provides a simple way to parametrise the video device, can capture +still images from the video stream or record the stream as mpeg file. +By using unicap, it can access many different video capture devices +like webcams, video grabber boards, IEEE-1394 (FireWire) cameras and +others. + +%prep +%setup -q + +%build +%configure --disable-schemas-install +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make DESTDIR=$RPM_BUILD_ROOT install +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + +# Install a working ucview.desktop file +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} + +# Don't install header files for ucview +rm -rf $RPM_BUILD_ROOT%{_includedir} + +%find_lang %{name} + +%pre +if [ $1 -gt 1 ]; then + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || : +fi + +%post +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi + +%preun +if [ $1 -eq 0 ]; then + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null 2>&1 || : +fi + +%postun +scrollkeeper-update -q || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog +%{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/dbus-1/services/*.service +%{_datadir}/icons/hicolor/*/apps/%{name}.png + +%changelog +* Sun May 18 2008 Robert Scheck 0.17-1 +- Upgrade to 0.17 +- Initial spec file for Fedora and Red Hat Enterprise Linux From ddecc1af4dd52ff561b857c379d1231a44b737c5 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 21:02:31 +0000 Subject: [PATCH 3/9] Upgrade to 0.20.1 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0893b27..a61d8be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -ucview-0.17.tar.gz +ucview-0.20.1.tar.gz ucview.desktop diff --git a/sources b/sources index 266aa33..dbda6d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e241951a418db9bd66d8da612af15328 ucview-0.17.tar.gz +8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz 6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop diff --git a/ucview.spec b/ucview.spec index cb164e9..eab563a 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.17 +Version: 0.20.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -9,8 +9,8 @@ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: unicap-devel >= 0.2.2, gtk2-devel >= 2.8.0, libglade2-devel -BuildRequires: dbus-glib-devel, glib2-devel, GConf2-devel, libXv-devel -BuildRequires: libtheora-devel, libvorbis-devel, desktop-file-utils +BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils +BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -40,7 +40,7 @@ make DESTDIR=$RPM_BUILD_ROOT install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Install a working ucview.desktop file -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} +desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} # Don't install header files for ucview rm -rf $RPM_BUILD_ROOT%{_includedir} @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon May 19 2008 Robert Scheck 0.20.1-1 +- Upgrade to 0.20.1 + * Sun May 18 2008 Robert Scheck 0.17-1 - Upgrade to 0.17 - Initial spec file for Fedora and Red Hat Enterprise Linux From 9b1674e71b7ed4516602d34ff0309f98c73b3cc9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Jul 2008 16:21:08 +0000 Subject: [PATCH 4/9] Upgrade to 0.21 --- .cvsignore | 3 +-- sources | 3 +-- ucview.desktop | 12 ++++++++++++ ucview.spec | 5 ++++- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 ucview.desktop diff --git a/.cvsignore b/.cvsignore index a61d8be..0ab6c89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -ucview-0.20.1.tar.gz -ucview.desktop +ucview-0.21.tar.gz diff --git a/sources b/sources index dbda6d8..28deef2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -8979216d7f60109d08d6a039ef7ef1d2 ucview-0.20.1.tar.gz -6a9ab0f416ba59bc3aea70011271ba57 ucview.desktop +bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz diff --git a/ucview.desktop b/ucview.desktop new file mode 100644 index 0000000..82300f2 --- /dev/null +++ b/ucview.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=UCView +GenericName=Image Capture Application +Type=Application +Comment=Capture video images +Exec=ucview +TryExec=ucview +Icon=ucview +Terminal=false +Categories=Application;AudioVideo;Video; +StartupNotify=true diff --git a/ucview.spec b/ucview.spec index eab563a..9c8b8aa 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.20.1 +Version: 0.21 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jul 27 2008 Robert Scheck 0.21-1 +- Upgrade to 0.21 + * Mon May 19 2008 Robert Scheck 0.20.1-1 - Upgrade to 0.20.1 From 1145545c70c423e28ac9c24486eb30a38da2ffff Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 21:44:34 +0000 Subject: [PATCH 5/9] Upgrade to 0.22 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0ab6c89..1e0fa2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ucview-0.21.tar.gz +ucview-0.22.tar.gz diff --git a/sources b/sources index 28deef2..3d2fd97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bccc09515f62bb6342cbd65dcba19dc2 ucview-0.21.tar.gz +1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz diff --git a/ucview.spec b/ucview.spec index 9c8b8aa..aaa63da 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,6 +1,6 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.21 +Version: 0.22 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -8,7 +8,7 @@ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext -BuildRequires: unicap-devel >= 0.2.2, gtk2-devel >= 2.8.0, libglade2-devel +BuildRequires: unicap-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 Requires: hicolor-icon-theme @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Oct 13 2008 Robert Scheck 0.22-1 +- Upgrade to 0.22 + * Sun Jul 27 2008 Robert Scheck 0.21-1 - Upgrade to 0.21 From c5bec2b168e44a296c631cbe05fc807df2a5c7ff Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 22:31:43 +0000 Subject: [PATCH 6/9] Add some missing files... --- ucview.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ucview.spec b/ucview.spec index aaa63da..697fe55 100644 --- a/ucview.spec +++ b/ucview.spec @@ -45,6 +45,9 @@ desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications % # Don't install header files for ucview rm -rf $RPM_BUILD_ROOT%{_includedir} +# Don't install any static .a and libtool .la files +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{a,la} + %find_lang %{name} %pre @@ -85,10 +88,12 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} +%{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_mandir}/man1/%{name}.1* %changelog * Mon Oct 13 2008 Robert Scheck 0.22-1 From 9664f2bd3838b18b095b3418ca04270a276a747c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 19 Oct 2008 14:25:17 +0000 Subject: [PATCH 7/9] Rebuild against unicap 0.93 --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 697fe55..4fbebe4 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1* %changelog +* Sun Oct 19 2008 Robert Scheck 0.22-2 +- Rebuild against unicap 0.93 + * Mon Oct 13 2008 Robert Scheck 0.22-1 - Upgrade to 0.22 From 543520146a8126e851b4a6db49d59e30287cb376 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:33 +0000 Subject: [PATCH 8/9] 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 fdfb55d..5feec0a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ucview 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 87a82db62be8746cebd43d98aa72db759a52506c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:36:51 +0000 Subject: [PATCH 9/9] 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 5feec0a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ucview -# $Id$ -NAME := ucview -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8