From e78fc3aea656da86d5f0c70021c2c2caf39c487a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 May 2008 16:26:54 +0000 Subject: [PATCH 01/13] Initialize branch EL-5 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..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 9f9205fb1829cbfebf424eb6684f4a3337ab8c13 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 19:18:34 +0000 Subject: [PATCH 02/13] 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 e46027a0d2b8a8fbce25dbdcc764cf12c8b84b00 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 20:45:42 +0000 Subject: [PATCH 03/13] Fixed *.desktop handling and DBUS support --- ucview.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ucview.spec b/ucview.spec index cb164e9..f868efd 100644 --- a/ucview.spec +++ b/ucview.spec @@ -9,8 +9,11 @@ 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 +%if 0%{?rhel} > 5 +BuildRequires: dbus-glib-devel >= 0.73 +%endif Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -40,7 +43,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} @@ -87,7 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop +%if 0%{?rhel} > 5 %{_datadir}/dbus-1/services/*.service +%endif %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog From ead9a1474684c156c5728767241f67342f0b5a6c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 21:01:55 +0000 Subject: [PATCH 04/13] Upgrade to 0.20.1 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 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 f868efd..adf9408 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 @@ -96,6 +96,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 05c913f82a88b09258f75fe18bd439cb3cd8680a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Jul 2008 16:21:07 +0000 Subject: [PATCH 05/13] 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 adf9408..10f104a 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 @@ -96,6 +96,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 92e7a366314cef530f98b5e6e5fdf71e48219010 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 21:44:34 +0000 Subject: [PATCH 06/13] 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 10f104a..d895032 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 %if 0%{?rhel} > 5 @@ -96,6 +96,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 56a32f2881bf14c98a6de318ad6bd644534eb209 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 22:31:42 +0000 Subject: [PATCH 07/13] Add some missing files... --- ucview.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ucview.spec b/ucview.spec index d895032..f754303 100644 --- a/ucview.spec +++ b/ucview.spec @@ -48,6 +48,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 @@ -88,12 +91,14 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} +%{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %if 0%{?rhel} > 5 %{_datadir}/dbus-1/services/*.service %endif %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_mandir}/man1/%{name}.1* %changelog * Mon Oct 13 2008 Robert Scheck 0.22-1 From 2c4a01e6ff586c7791a977c3483b87b295b5b7e7 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 19 Oct 2008 14:25:17 +0000 Subject: [PATCH 08/13] Rebuild against unicap 0.93 --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index f754303..3ba7f08 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/ @@ -101,6 +101,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 88141a92662020a85fdfd91c8d9bd3d7c2c9bf7e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 4 May 2009 10:16:29 +0000 Subject: [PATCH 09/13] Upgrade to 0.23 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 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 3ba7f08..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/ @@ -11,9 +11,6 @@ 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 -%if 0%{?rhel} > 5 -BuildRequires: dbus-glib-devel >= 0.73 -%endif Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -94,13 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%if 0%{?rhel} > 5 -%{_datadir}/dbus-1/services/*.service -%endif %{_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 d95e4b82e2974eca02074e82b9c8ab476d43654c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 24 May 2009 02:18:45 +0000 Subject: [PATCH 10/13] 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 8419bbad9412984d0790d7d0baec3b745f3b895e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:32 +0000 Subject: [PATCH 11/13] 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 089f94bd3cac64b5318ef484ce6dc7c9a6cebf48 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 27 Feb 2010 00:58:47 +0000 Subject: [PATCH 12/13] Upgrade to 0.31 (#530708) --- .cvsignore | 2 +- sources | 2 +- ucview-0.31-include.patch | 15 ++++++++++++ ucview.desktop | 2 +- ucview.spec | 48 +++++++++++++++++++++++++++++---------- 5 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 ucview-0.31-include.patch diff --git a/.cvsignore b/.cvsignore index 9302208..4d207d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ucview-0.23.tar.gz +ucview-0.31.tar.gz diff --git a/sources b/sources index 6e6cb7e..9b891d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -570a5d155b22529267a5a63eb95554ee ucview-0.23.tar.gz +b36fd5c54cb200f9917abedd5469bb94 ucview-0.31.tar.gz diff --git a/ucview-0.31-include.patch b/ucview-0.31-include.patch new file mode 100644 index 0000000..a591eff --- /dev/null +++ b/ucview-0.31-include.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck for ucview >= 0.31 to fix broken +include. Upstream is aware about the issue - and this should be fixed for the next +release of ucview. + +--- ucview-0.31/src/ucview-window.h 2009-12-08 18:25:26.000000000 +0100 ++++ ucview-0.31/src/ucview-window.h.include 2010-02-21 18:59:53.000000000 +0100 +@@ -12,7 +12,7 @@ + #include + #include + +-#include ++#include + + #define UCVIEW_GCONF_DIR "/apps/ucview" + #define UCVIEW_PLUGIN_GCONF_DIR "plugins" diff --git a/ucview.desktop b/ucview.desktop index 82300f2..bd00c40 100644 --- a/ucview.desktop +++ b/ucview.desktop @@ -8,5 +8,5 @@ Exec=ucview TryExec=ucview Icon=ucview Terminal=false -Categories=Application;AudioVideo;Video; +Categories=AudioVideo;Video;X-AudioVideoCapture; StartupNotify=true diff --git a/ucview.spec b/ucview.spec index 1a51995..7b60685 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,16 +1,16 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.23 -Release: 2%{?dist} +Version: 0.31 +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.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 +Patch0: ucview-0.31-include.patch +BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-devel +BuildRequires: libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel +BuildRequires: desktop-file-utils, dbus-glib-devel >= 0.73 Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -26,8 +26,18 @@ By using unicap, it can access many different video capture devices like webcams, video grabber boards, IEEE-1394 (FireWire) cameras and others. +%package devel +Summary: Development files for UCView +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +The ucview-devel package includes header files necessary for building +and developing programs and plugins which use UCView. + %prep %setup -q +%patch0 -p1 -b .include %build %configure --disable-schemas-install @@ -42,11 +52,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Install a working ucview.desktop file desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} -# 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} +# Create plugin directory for ucview plugins +mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins %find_lang %{name} @@ -84,7 +91,7 @@ fi rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} @@ -94,7 +101,24 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name} +%{_libdir}/pkgconfig/%{name}.pc + %changelog +* Sat Feb 27 2010 Robert Scheck 0.31-1 +- Upgrade to 0.31 (#530708) + +* Sat Oct 24 2009 Robert Scheck 0.30-1 +- Upgrade to 0.30 (#530708) + +* Sun Sep 27 2009 Orcan Ogetbil - 0.23-4 +- Update desktop file according to F-12 FedoraStudio feature + +* Sun Jul 26 2009 Fedora Release Engineering - 0.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun May 24 2009 Robert Scheck 0.23-2 - Readded wrongly removed build requirement to dbus-glib-devel From ed0e53afe6cd68b60617c052a55ab420aae972aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:36:55 +0000 Subject: [PATCH 13/13] 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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5