From aa12f3594427a1bd3374275a08f4019932935e73 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:01:11 +0000 Subject: [PATCH 1/5] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From be90c53e2637aa4eec035ffdbfd2b983fc3c012b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 4 May 2009 10:16:30 +0000 Subject: [PATCH 2/5] Upgrade to 0.23 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1e0fa2a..9302208 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ucview-0.22.tar.gz +ucview-0.23.tar.gz diff --git a/sources b/sources index 3d2fd97..6e6cb7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b43c823624962bde3248ae493995750 ucview-0.22.tar.gz +570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz diff --git a/ucview.spec b/ucview.spec index 4fbebe4..c7cad0f 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: 2%{?dist} +Version: 0.23 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext 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 +BuildRequires: libtheora-devel, libvorbis-devel Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -91,11 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_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 May 04 2009 Robert Scheck 0.23-1 +- Upgrade to 0.23 + +* Mon Feb 23 2009 Robert Scheck 0.22-3 +- Rebuild against gcc 4.4 and rpm 4.6 + * Sun Oct 19 2008 Robert Scheck 0.22-2 - Rebuild against unicap 0.93 From 3854a344c3198434ad4ea21f95890db340187f8b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 24 May 2009 02:18:45 +0000 Subject: [PATCH 3/5] Readded wrongly removed build requirement to dbus-glib-devel --- ucview.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ucview.spec b/ucview.spec index c7cad0f..1a51995 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -10,7 +10,7 @@ Source1: %{name}.desktop BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext 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 +BuildRequires: libtheora-devel, libvorbis-devel, dbus-glib-devel >= 0.73 Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1* %changelog +* Sun May 24 2009 Robert Scheck 0.23-2 +- Readded wrongly removed build requirement to dbus-glib-devel + * Mon May 04 2009 Robert Scheck 0.23-1 - Upgrade to 0.23 From 1854e75d477430ac7cb99ec3a90cb5b990cd9b09 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:32 +0000 Subject: [PATCH 4/5] 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 f702ccc057c817d2dbed8100ed22feedf1b5a6f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:36:54 +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 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10