From 20ac42f49389dc816657c97ce3b79790ac9bd776 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 19:20:00 +0000 Subject: [PATCH 01/55] 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 ff8c3105767f8c05a52f141792270bb1ef10385b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 21:03:14 +0000 Subject: [PATCH 02/55] 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 87f8528ec92d9233e67f1b9c9b50884a666d028e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Jul 2008 16:21:09 +0000 Subject: [PATCH 03/55] 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 878f208badde40bd52511b95dff90ac2311e0d97 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 21:44:34 +0000 Subject: [PATCH 04/55] 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 004a77cd2d7bf92a350e1454d38a49f0ad96791d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 22:19:29 +0000 Subject: [PATCH 05/55] Added 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 e03ace927aebe3d18992fe1084337f7a2b0c8c03 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 19 Oct 2008 14:25:18 +0000 Subject: [PATCH 06/55] 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 66dd27c89c5a9b666b3d09fef8405c7d44c2b123 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 23 Feb 2009 21:16:43 +0000 Subject: [PATCH 07/55] Rebuild against gcc 4.4 and rpm 4.6 --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 4fbebe4..9c648d5 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} +Release: 3%{?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 +* 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 4e69c08cea45df00015bfd71d57f086cf05c16cc Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 4 May 2009 10:16:31 +0000 Subject: [PATCH 08/55] Upgrade to 0.23 --- .cvsignore | 2 +- sources | 2 +- ucview.spec | 10 ++++++---- 3 files changed, 8 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 9c648d5..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: 3%{?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,13 @@ 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 From f177d1cfb41a0d5a05c0a6343d24b22fc21a4198 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 24 May 2009 02:18:47 +0000 Subject: [PATCH 09/55] 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 af12cdbccec48040b7db529f34e43b9de37c27db Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:27:04 +0000 Subject: [PATCH 10/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 1a51995..3d9793b 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: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1* %changelog +* 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 31012af4df6f0c63dcf9e64892600cbada33fbbe Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 27 Sep 2009 07:42:11 +0000 Subject: [PATCH 11/55] - Update desktop file according to F-12 FedoraStudio feature --- ucview.desktop | 2 +- ucview.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 3d9793b..3ddf790 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: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1* %changelog +* 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 From b91cfe46212b648a2c203af2a94f40299717f4e5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:45 +0000 Subject: [PATCH 12/55] 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 2fb57b93f5629206a0ec3c6535e431632fbd7dac Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 27 Feb 2010 00:58:50 +0000 Subject: [PATCH 13/55] Upgrade to 0.31 (#530708) --- .cvsignore | 2 +- sources | 2 +- ucview-0.31-include.patch | 15 ++++++++++++++ ucview.spec | 42 ++++++++++++++++++++++++++++----------- 4 files changed, 47 insertions(+), 14 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.spec b/ucview.spec index 3ddf790..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: 4%{?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,18 @@ 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 From f10ef1e97892931ee23431582a3b492b0a63162f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:36:56 +0000 Subject: [PATCH 14/55] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From d59d4e3f38cd56e540d84e89fb7b66ae32269871 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Oct 2010 01:02:16 +0200 Subject: [PATCH 15/55] Upgrade to 0.33 (#643107) --- .gitignore | 2 +- sources | 2 +- ucview-0.31-include.patch | 15 --------------- ucview.spec | 7 ++++--- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 ucview-0.31-include.patch diff --git a/.gitignore b/.gitignore index 4d207d2..79c41e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ucview-0.31.tar.gz +ucview-0.33.tar.gz diff --git a/sources b/sources index 9b891d2..46500ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b36fd5c54cb200f9917abedd5469bb94 ucview-0.31.tar.gz +da609cf706e70254abea06cc1fb495e2 ucview-0.33.tar.gz diff --git a/ucview-0.31-include.patch b/ucview-0.31-include.patch deleted file mode 100644 index a591eff..0000000 --- a/ucview-0.31-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.spec b/ucview.spec index 7b60685..b08d48c 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,13 +1,12 @@ Summary: Image and video capture application using unicap toolkit Name: ucview -Version: 0.31 +Version: 0.33 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 -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 @@ -37,7 +36,6 @@ and developing programs and plugins which use UCView. %prep %setup -q -%patch0 -p1 -b .include %build %configure --disable-schemas-install @@ -107,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Oct 18 2010 Robert Scheck 0.33-1 +- Upgrade to 0.33 (#643107) + * Sat Feb 27 2010 Robert Scheck 0.31-1 - Upgrade to 0.31 (#530708) From 4d55f43d851c999c171b95de3762bbdde07f649c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 17:56:27 -0600 Subject: [PATCH 16/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index b08d48c..47a9ac0 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Oct 18 2010 Robert Scheck 0.33-1 - Upgrade to 0.33 (#643107) From 3a5ff193616db9a67a9fc0be6b8593c9fcc4d73b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 26 Dec 2011 00:14:24 +0100 Subject: [PATCH 17/55] Build on EPEL 6 requires libXv-devel which is not a requirement of other -devel packages somehow... --- ucview.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ucview.spec b/ucview.spec index 47a9ac0..d0bcbe4 100644 --- a/ucview.spec +++ b/ucview.spec @@ -10,6 +10,9 @@ Source1: %{name}.desktop 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 +%if 0%{?rhel} >= 6 +BuildRequires: libXv-devel +%endif Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper From 76d30e814bb26b493bad406c1703b28f26d3bb6c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 26 Dec 2011 00:21:14 +0100 Subject: [PATCH 18/55] Work further around broken RHEL 6 dependencies...adding libtheora-devel --- ucview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index d0bcbe4..120c08c 100644 --- a/ucview.spec +++ b/ucview.spec @@ -11,7 +11,7 @@ BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-de BuildRequires: libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: desktop-file-utils, dbus-glib-devel >= 0.73 %if 0%{?rhel} >= 6 -BuildRequires: libXv-devel +BuildRequires: libXv-devel, libtheora-devel %endif Requires: hicolor-icon-theme Requires(pre): GConf2 From 0291a5bbad4c5d85f050b2d07674012feaa6c80e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 26 Dec 2011 00:27:35 +0100 Subject: [PATCH 19/55] Added libvorbis-devel as build requirement on RHEL 6 --- ucview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 120c08c..1e64363 100644 --- a/ucview.spec +++ b/ucview.spec @@ -11,7 +11,7 @@ BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-de BuildRequires: libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel BuildRequires: desktop-file-utils, dbus-glib-devel >= 0.73 %if 0%{?rhel} >= 6 -BuildRequires: libXv-devel, libtheora-devel +BuildRequires: libXv-devel, libtheora-devel, libvorbis-devel %endif Requires: hicolor-icon-theme Requires(pre): GConf2 From 2c6b833171f33e20c56a0c7c9d263c6e47e28db4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:25:08 -0600 Subject: [PATCH 20/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 1e64363..5051f2a 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 38626b31fdf753d0841aa2a21907f34bc27f03d0 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 15 Jan 2012 19:43:53 +0100 Subject: [PATCH 21/55] Added patch for linking gmodule-2.0 --- ucview-0.33-gmodule.patch | 72 +++++++++++++++++++++++++++++++++++++++ ucview.spec | 2 ++ 2 files changed, 74 insertions(+) create mode 100644 ucview-0.33-gmodule.patch diff --git a/ucview-0.33-gmodule.patch b/ucview-0.33-gmodule.patch new file mode 100644 index 0000000..a23db41 --- /dev/null +++ b/ucview-0.33-gmodule.patch @@ -0,0 +1,72 @@ +Patch by Robert Scheck for ucview >= 0.33, which +adds missing linking to gmodule-2.0 during build. Without this patch ucview +rebuild on Fedora 17+ simply fails with: + + ucview-ucview-window.o: undefined reference to symbol 'g_module_name' + +The second part of this patch is run-time only, however it avoids running +autoconf in the buildsystem. + +--- ucview-0.33/configure.in 2010-10-04 19:46:32.000000000 +0200 ++++ ucview-0.33/configure.in.gmodule 2012-01-15 19:27:03.000000000 +0100 +@@ -37,7 +37,7 @@ + + + PKG_CHECK_MODULES(UCVIEW, +- libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) ++ libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) + + #CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + +--- ucview-0.33/configure 2010-10-04 19:46:47.000000000 +0200 ++++ ucview-0.33/configure.gmodule 2012-01-15 19:26:46.000000000 +0100 +@@ -11564,12 +11564,12 @@ + pkg_cv_UCVIEW_CFLAGS="$UCVIEW_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_UCVIEW_CFLAGS=`$PKG_CONFIG --cflags "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` ++ pkg_cv_UCVIEW_CFLAGS=`$PKG_CONFIG --cflags "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11582,12 +11582,12 @@ + pkg_cv_UCVIEW_LIBS="$UCVIEW_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_UCVIEW_LIBS=`$PKG_CONFIG --libs "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` ++ pkg_cv_UCVIEW_LIBS=`$PKG_CONFIG --libs "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11606,14 +11606,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UCVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` ++ UCVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` + else +- UCVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` ++ UCVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` + fi + # Put the nasty error message in config.log where it belongs + echo "$UCVIEW_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) were not met: ++ as_fn_error "Package requirements (libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) were not met: + + $UCVIEW_PKG_ERRORS + diff --git a/ucview.spec b/ucview.spec index 5051f2a..f8a613b 100644 --- a/ucview.spec +++ b/ucview.spec @@ -7,6 +7,7 @@ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: ucview-0.33-gmodule.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 @@ -39,6 +40,7 @@ and developing programs and plugins which use UCView. %prep %setup -q +%patch0 -p1 -b .gmodule %build %configure --disable-schemas-install From 44c91f647704797b74f78d825d4062a044992651 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 20:20:15 -0500 Subject: [PATCH 22/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index f8a613b..07c3cb9 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From def8017d17389da1f54d36907da74cc5db86e137 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:20:44 -0600 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 07c3cb9..37776d0 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.33-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4d163ab7d0b9982542c8c7bf2bcb36997d75cfe7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:20:42 -0500 Subject: [PATCH 24/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 37776d0..1022aab 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.33-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.33-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From bf901c4f6ae705dbb459cbbe244815b6099025ac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:30:12 -0500 Subject: [PATCH 25/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 1022aab..be2156a 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.33-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.33-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b33b47cc617c9edc781d67d0f23a309d8d5ca02c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:41:17 +0000 Subject: [PATCH 26/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index be2156a..8c69ffc 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.33-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.33-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 10d577bcd4820da2b797e41eaca4511fc1787de4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:25:40 +0000 Subject: [PATCH 27/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 8c69ffc..510940f 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.33-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.33-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 45a50c50187a6723dc90918eeb11533ff31bd3dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:14:19 +0000 Subject: [PATCH 28/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 510940f..a6ac5d8 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.33-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.33-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From baeebbab64db24d4986fc0acf7a6e40c8599dcc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:36:48 +0000 Subject: [PATCH 29/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index a6ac5d8..c01508b 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.33-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.33-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From cce444161719eb2aa11d80cf8600d69e498cbf99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:52:34 +0000 Subject: [PATCH 30/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index c01508b..5c41e4a 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.33-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.33-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2ac4e4b9582710c676dcbe9ad0b6b79d33375cd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:42:23 +0000 Subject: [PATCH 31/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 5c41e4a..ad5d4e2 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.33-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4f2667d3028170621ad3a46f1a3074da38d6e068 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:51:46 +0000 Subject: [PATCH 32/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index ad5d4e2..61d86e9 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.33-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.33-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 1051c0582cb4b410008222a0f4a90f9a35b388da Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:46:08 +0100 Subject: [PATCH 33/55] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- ucview.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 61d86e9..8cf93fe 100644 --- a/ucview.spec +++ b/ucview.spec @@ -19,7 +19,6 @@ 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. From dd5f3157f18a71fa41bcac31a7dbf69ded0fa9e7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:56:52 +0100 Subject: [PATCH 34/55] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- ucview.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ucview.spec b/ucview.spec index 8cf93fe..4eb72c1 100644 --- a/ucview.spec +++ b/ucview.spec @@ -89,9 +89,6 @@ 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 From 5f6d2bb591314848f2c5d09b78c0a1ffe3225f59 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:52 +0200 Subject: [PATCH 35/55] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- ucview.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ucview.spec b/ucview.spec index 4eb72c1..29ec9f6 100644 --- a/ucview.spec +++ b/ucview.spec @@ -8,6 +8,7 @@ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: ucview-0.33-gmodule.patch +BuildRequires: gcc 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 From d9e284b71073789fc539b39df5cbbb0df1de653d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:40:54 -0500 Subject: [PATCH 36/55] Remove needless use of %defattr --- ucview.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ucview.spec b/ucview.spec index 29ec9f6..9194842 100644 --- a/ucview.spec +++ b/ucview.spec @@ -91,7 +91,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then fi %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} @@ -102,7 +101,6 @@ fi %{_mandir}/man1/%{name}.1* %files devel -%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}.pc From 4cfeb5a0993e4df8de39f9bf53f395bd5447d04e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:08:12 +0000 Subject: [PATCH 37/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 9194842..2570051 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.unicap-imaging.org/ @@ -105,6 +105,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.33-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.33-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 66defa7873474ce08f580a270cae5a6cce05b16f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 13:19:08 +0100 Subject: [PATCH 38/55] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- ucview.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ucview.spec b/ucview.spec index 2570051..9a2ec5c 100644 --- a/ucview.spec +++ b/ucview.spec @@ -71,11 +71,6 @@ 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) @@ -85,11 +80,6 @@ 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 - %files -f %{name}.lang %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas From 6cf7536aee445698a92b5fc21dc5ba0c1608e235 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Jan 2019 23:50:47 +0100 Subject: [PATCH 39/55] Make obsolete scriptlets conditional for EPEL < 8 --- ucview.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ucview.spec b/ucview.spec index 9a2ec5c..6813282 100644 --- a/ucview.spec +++ b/ucview.spec @@ -71,6 +71,13 @@ 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 || : +%if 0%{?rhel} && 0%{?rhel} <= 7 +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi +%endif + %preun if [ $1 -eq 0 ]; then export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) @@ -80,6 +87,13 @@ fi %postun scrollkeeper-update -q || : +%if 0%{?rhel} && 0%{?rhel} <= 7 +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi +%endif + %files -f %{name}.lang %doc AUTHORS COPYING ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas From 65fd97091198716a3c1d3482ca62fb952a8b87b7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 40/55] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- ucview.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ucview.spec b/ucview.spec index 6813282..c2d8afe 100644 --- a/ucview.spec +++ b/ucview.spec @@ -3,7 +3,6 @@ Name: ucview Version: 0.33 Release: 15%{?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 @@ -31,7 +30,6 @@ others. %package devel Summary: Development files for UCView -Group: Development/Libraries Requires: %{name} = %{version}-%{release}, pkgconfig %description devel From 5c3f57ddba5db20867eb1eff102f6b0100220487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:39:15 +0000 Subject: [PATCH 41/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index c2d8afe..5db8eed 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -107,6 +107,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.33-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.33-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1eeb238f99df24fd3415e502730defb27820e901 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:18:39 +0000 Subject: [PATCH 42/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 5db8eed..e0ccf7a 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -107,6 +107,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.33-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.33-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2565732a94f3905000d03a7d79c7dac2ab71392e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:25:30 +0000 Subject: [PATCH 43/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index e0ccf7a..8e2cc68 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -107,6 +107,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.33-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.33-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 40a6b68592c8f349816a0b111307967b23941a0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:09:31 +0000 Subject: [PATCH 44/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 8e2cc68..c630d95 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -107,6 +107,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.33-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.33-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6dd0ca0f650d22d17d7f56d2076a8262dc054cf0 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 31 Dec 2020 15:56:50 +0100 Subject: [PATCH 45/55] Spec file cleanup --- .gitignore | 2 +- sources | 2 +- ucview.spec | 39 +++++++++++++++------------------------ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 79c41e3..5355adc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ucview-0.33.tar.gz +/ucview-*.tar.gz diff --git a/sources b/sources index 46500ef..30dbf26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da609cf706e70254abea06cc1fb495e2 ucview-0.33.tar.gz +SHA512 (ucview-0.33.tar.gz) = 324615d349c3f476a838a3d833efb6faf1f409e1c623984abd1727a25b19fb3ca358573a41fffa964a475e7c6312847e7301c6ce2f132cb301e40b4eab2a17a4 diff --git a/ucview.spec b/ucview.spec index c630d95..5cea697 100644 --- a/ucview.spec +++ b/ucview.spec @@ -3,17 +3,15 @@ Name: ucview Version: 0.33 Release: 19%{?dist} License: GPLv2+ -URL: http://www.unicap-imaging.org/ -Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +URL: https://www.unicap-imaging.org/ +Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: ucview-0.33-gmodule.patch -BuildRequires: gcc -BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, GConf2-devel +BuildRequires: gcc, make +BuildRequires: intltool, %{_bindir}/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 -%if 0%{?rhel} >= 6 BuildRequires: libXv-devel, libtheora-devel, libvorbis-devel -%endif Requires: hicolor-icon-theme Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper @@ -30,7 +28,7 @@ others. %package devel Summary: Development files for UCView -Requires: %{name} = %{version}-%{release}, pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig %description devel The ucview-devel package includes header files necessary for building @@ -42,32 +40,27 @@ and developing programs and plugins which use UCView. %build %configure --disable-schemas-install -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make DESTDIR=$RPM_BUILD_ROOT install +%make_install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Install a working ucview.desktop file desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} # Create plugin directory for ucview plugins -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ %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 +%gconf_schema_prepare %{name} %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 || : +%gconf_schema_upgrade %{name} %if 0%{?rhel} && 0%{?rhel} <= 7 touch --no-create %{_datadir}/icons/hicolor @@ -77,10 +70,7 @@ fi %endif %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 +%gconf_schema_remove %{name} %postun scrollkeeper-update -q || : @@ -93,11 +83,12 @@ fi %endif %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog +%license COPYING +%doc AUTHORS ChangeLog %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} -%{_libdir}/%{name} -%{_datadir}/%{name} +%{_libdir}/%{name}/ +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1* From c32535e769e45105abf1c776cc5225abbba3fb76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:33:13 +0000 Subject: [PATCH 46/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 5cea697..f25d373 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.33-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.33-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 76ad0371bd82d506b455b15d603e559c3240e6a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:54:34 +0000 Subject: [PATCH 47/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index f25d373..d25e661 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.33-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.33-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f70ec0592b1e672c4438460d6c906964d5f98b9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:23:38 +0000 Subject: [PATCH 48/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index d25e661..206b9a5 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.33-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.33-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b299abfd54692709cd1e209af8bf3c5a3a57f6b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:15:12 +0000 Subject: [PATCH 49/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 206b9a5..dc5fd0f 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.33-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.33-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d70d199a606543f71f306895f1306682550da124 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:40:02 +0000 Subject: [PATCH 50/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index dc5fd0f..9381a3d 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.33-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.33-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 89144c218189cf92275776e4979c89cb57ee8c03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:58:46 +0000 Subject: [PATCH 51/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 9381a3d..e04e333 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.33-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.33-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9ccb7d177c0021480fa472bd69062f8d78f5674b Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 9 Sep 2023 22:57:13 -0300 Subject: [PATCH 52/55] Fix FTBFS rhbz#2226491 --- ucview-0.33-charset.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ucview-0.33-charset.patch diff --git a/ucview-0.33-charset.patch b/ucview-0.33-charset.patch new file mode 100644 index 0000000..4ededb2 --- /dev/null +++ b/ucview-0.33-charset.patch @@ -0,0 +1,11 @@ +--- ucview-0.33/po/de.po-orig 2008-07-17 13:26:23.000000000 -0300 ++++ ucview-0.33/po/de.po 2023-09-09 22:52:51.129230861 -0300 +@@ -14,7 +14,7 @@ + "Last-Translator: <>\n" + "Language-Team: \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: " + + #: ../data/ucview.schemas.in.h:1 From 59d5e7262d742cc30a140d4e4c756ae0c909f750 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 9 Sep 2023 22:57:25 -0300 Subject: [PATCH 53/55] Fix FTBFS rhbz#2226491 --- ucview.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ucview.spec b/ucview.spec index e04e333..9010de5 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,12 +1,13 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: ucview-0.33-gmodule.patch +Patch1: ucview-0.33-charset.patch BuildRequires: gcc, make BuildRequires: intltool, %{_bindir}/perl, perl(XML::Parser), gettext, GConf2-devel BuildRequires: libunicapgtk-devel >= 0.2.23, gtk2-devel >= 2.8.0, libglade2-devel @@ -35,8 +36,7 @@ The ucview-devel package includes header files necessary for building and developing programs and plugins which use UCView. %prep -%setup -q -%patch0 -p1 -b .gmodule +%autosetup -p1 %build %configure --disable-schemas-install @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Sep 10 2023 Filipe Rosset - 0.33-26 +- Fix FTBFS rhbz#2226491 + * Sat Jul 22 2023 Fedora Release Engineering - 0.33-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8958f35208bb04a6a6601ff0a203b4109623e899 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:58:15 +0000 Subject: [PATCH 54/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ucview.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucview.spec b/ucview.spec index 9010de5..2b0a92d 100644 --- a/ucview.spec +++ b/ucview.spec @@ -1,7 +1,7 @@ Summary: Image and video capture application using unicap toolkit Name: ucview Version: 0.33 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ URL: https://www.unicap-imaging.org/ Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.33-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Sep 10 2023 Filipe Rosset - 0.33-26 - Fix FTBFS rhbz#2226491 From 2d1b19a314442dfddf22d28469be2ec9e4ed5b74 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 Mar 2024 04:10:02 +0100 Subject: [PATCH 55/55] Project unicap-imaging.org is inactive and its code unmaintained for 7+ years --- .gitignore | 1 - dead.package | 1 + sources | 1 - ucview-0.33-charset.patch | 11 -- ucview-0.33-gmodule.patch | 72 ------------- ucview.desktop | 12 --- ucview.spec | 217 -------------------------------------- 7 files changed, 1 insertion(+), 314 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 ucview-0.33-charset.patch delete mode 100644 ucview-0.33-gmodule.patch delete mode 100644 ucview.desktop delete mode 100644 ucview.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5355adc..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/ucview-*.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..56bc447 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Project unicap-imaging.org is inactive and its code unmaintained for 7+ years diff --git a/sources b/sources deleted file mode 100644 index 30dbf26..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (ucview-0.33.tar.gz) = 324615d349c3f476a838a3d833efb6faf1f409e1c623984abd1727a25b19fb3ca358573a41fffa964a475e7c6312847e7301c6ce2f132cb301e40b4eab2a17a4 diff --git a/ucview-0.33-charset.patch b/ucview-0.33-charset.patch deleted file mode 100644 index 4ededb2..0000000 --- a/ucview-0.33-charset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ucview-0.33/po/de.po-orig 2008-07-17 13:26:23.000000000 -0300 -+++ ucview-0.33/po/de.po 2023-09-09 22:52:51.129230861 -0300 -@@ -14,7 +14,7 @@ - "Last-Translator: <>\n" - "Language-Team: \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: " - - #: ../data/ucview.schemas.in.h:1 diff --git a/ucview-0.33-gmodule.patch b/ucview-0.33-gmodule.patch deleted file mode 100644 index a23db41..0000000 --- a/ucview-0.33-gmodule.patch +++ /dev/null @@ -1,72 +0,0 @@ -Patch by Robert Scheck for ucview >= 0.33, which -adds missing linking to gmodule-2.0 during build. Without this patch ucview -rebuild on Fedora 17+ simply fails with: - - ucview-ucview-window.o: undefined reference to symbol 'g_module_name' - -The second part of this patch is run-time only, however it avoids running -autoconf in the buildsystem. - ---- ucview-0.33/configure.in 2010-10-04 19:46:32.000000000 +0200 -+++ ucview-0.33/configure.in.gmodule 2012-01-15 19:27:03.000000000 +0100 -@@ -37,7 +37,7 @@ - - - PKG_CHECK_MODULES(UCVIEW, -- libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) -+ libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) - - #CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" - ---- ucview-0.33/configure 2010-10-04 19:46:47.000000000 +0200 -+++ ucview-0.33/configure.gmodule 2012-01-15 19:26:46.000000000 +0100 -@@ -11564,12 +11564,12 @@ - pkg_cv_UCVIEW_CFLAGS="$UCVIEW_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_UCVIEW_CFLAGS=`$PKG_CONFIG --cflags "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` -+ pkg_cv_UCVIEW_CFLAGS=`$PKG_CONFIG --cflags "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11582,12 +11582,12 @@ - pkg_cv_UCVIEW_LIBS="$UCVIEW_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 \""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_UCVIEW_LIBS=`$PKG_CONFIG --libs "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` -+ pkg_cv_UCVIEW_LIBS=`$PKG_CONFIG --libs "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 " 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11606,14 +11606,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- UCVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` -+ UCVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` - else -- UCVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` -+ UCVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 "` - fi - # Put the nasty error message in config.log where it belongs - echo "$UCVIEW_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) were not met: -+ as_fn_error "Package requirements (libunicapgtk >= 0.2.23 gtk+-2.0 >= 2.8.0 gmodule-2.0 >= 2.8.0 gthread-2.0 >= 2.8.0 gconf-2.0 libucil >= 0.2.2 libglade-2.0 ) were not met: - - $UCVIEW_PKG_ERRORS - diff --git a/ucview.desktop b/ucview.desktop deleted file mode 100644 index bd00c40..0000000 --- a/ucview.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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=AudioVideo;Video;X-AudioVideoCapture; -StartupNotify=true diff --git a/ucview.spec b/ucview.spec deleted file mode 100644 index 2b0a92d..0000000 --- a/ucview.spec +++ /dev/null @@ -1,217 +0,0 @@ -Summary: Image and video capture application using unicap toolkit -Name: ucview -Version: 0.33 -Release: 27%{?dist} -License: GPLv2+ -URL: https://www.unicap-imaging.org/ -Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: ucview-0.33-gmodule.patch -Patch1: ucview-0.33-charset.patch -BuildRequires: gcc, make -BuildRequires: intltool, %{_bindir}/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 -BuildRequires: libXv-devel, libtheora-devel, libvorbis-devel -Requires: hicolor-icon-theme -Requires(pre): GConf2 -Requires(post): GConf2, scrollkeeper -Requires(preun): GConf2 -Requires(postun): scrollkeeper - -%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. - -%package devel -Summary: Development files for UCView -Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig - -%description devel -The ucview-devel package includes header files necessary for building -and developing programs and plugins which use UCView. - -%prep -%autosetup -p1 - -%build -%configure --disable-schemas-install -%make_build - -%install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%make_install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - -# Install a working ucview.desktop file -desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} - -# Create plugin directory for ucview plugins -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ - -%find_lang %{name} - -%pre -%gconf_schema_prepare %{name} - -%post -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : -%gconf_schema_upgrade %{name} - -%if 0%{?rhel} && 0%{?rhel} <= 7 -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi -%endif - -%preun -%gconf_schema_remove %{name} - -%postun -scrollkeeper-update -q || : - -%if 0%{?rhel} && 0%{?rhel} <= 7 -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi -%endif - -%files -f %{name}.lang -%license COPYING -%doc AUTHORS ChangeLog -%{_sysconfdir}/gconf/schemas/%{name}.schemas -%{_bindir}/%{name} -%{_libdir}/%{name}/ -%{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_mandir}/man1/%{name}.1* - -%files devel -%{_includedir}/%{name} -%{_libdir}/pkgconfig/%{name}.pc - -%changelog -* Sat Jan 27 2024 Fedora Release Engineering - 0.33-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Sep 10 2023 Filipe Rosset - 0.33-26 -- Fix FTBFS rhbz#2226491 - -* Sat Jul 22 2023 Fedora Release Engineering - 0.33-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.33-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.33-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.33-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.33-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.33-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.33-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.33-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.33-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.33-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.33-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.33-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.33-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.33-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.33-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.33-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.33-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 0.33-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.33-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.33-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.33-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.33-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.33-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Oct 18 2010 Robert Scheck 0.33-1 -- Upgrade to 0.33 (#643107) - -* 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 - -* 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 - -* 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 - -* 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