From 92a8e8fa1a9ff138c0b256a6b6b467faa4ba3c07 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 18 Feb 2008 17:33:59 +0000 Subject: [PATCH 1/7] Initialize branch F-7 for unicap --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 83582f0599b2dbe9d90133f804227e7ea40a6278 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Feb 2008 22:14:36 +0000 Subject: [PATCH 2/7] Initial import of unicap --- .cvsignore | 1 + sources | 1 + unicap-0.2.19-libdir.patch | 87 ++++++++++++++++++++++++++++++++++++++ unicap.spec | 85 +++++++++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+) create mode 100644 unicap-0.2.19-libdir.patch create mode 100644 unicap.spec diff --git a/.cvsignore b/.cvsignore index e69de29..0c9f421 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +unicap-0.2.19.tar.gz diff --git a/sources b/sources index e69de29..9d69924 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0ab0a533f5c1ff3a24853d2564ffb14f unicap-0.2.19.tar.gz diff --git a/unicap-0.2.19-libdir.patch b/unicap-0.2.19-libdir.patch new file mode 100644 index 0000000..e65f7b5 --- /dev/null +++ b/unicap-0.2.19-libdir.patch @@ -0,0 +1,87 @@ +Patch by Ralf Corsepius for unicap >= 0.2.19, which causes the use +of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used. + +--- unicap-0.2.19/cpi/dcam/Makefile.am 2007-08-02 22:29:53.000000000 +0200 ++++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir 2008-02-05 11:35:57.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libdcam.la + else +-lib_LTLIBRARIES = libdcam.la ++libcpi_LTLIBRARIES = libdcam.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@ + +--- unicap-0.2.19/cpi/thing/Makefile.am 2006-04-16 22:02:55.000000000 +0200 ++++ unicap-0.2.19/cpi/thing/Makefile.am.libdir 2008-02-05 11:36:58.000000000 +0100 +@@ -1,9 +1,9 @@ + MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../include -I../../include + +-lib_LTLIBRARIES = libthing.la ++libcpi_LTLIBRARIES = libthing.la + +-libdir = $(prefix)/lib/unicap/cpi ++libcpidir = $(libdir)/unicap/cpi + + + libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +--- unicap-0.2.19/cpi/v4l/Makefile.am 2007-08-02 22:30:32.000000000 +0200 ++++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir 2008-02-05 11:37:23.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libv4l.la + else +-lib_LTLIBRARIES = libv4l.la ++libcpi_LTLIBRARIES = libv4l.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + + libv4l_la_LDFLAGS = +--- unicap-0.2.19/cpi/v4l2/Makefile.am 2008-02-02 16:07:46.000000000 +0100 ++++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir 2008-02-05 11:36:25.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libv4l2.la + else +-lib_LTLIBRARIES = libv4l2.la ++libcpi_LTLIBRARIES = libv4l2.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + + libv4l2_la_LDFLAGS = +--- unicap-0.2.19/cpi/vid21394/Makefile.am 2007-08-02 22:29:34.000000000 +0200 ++++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir 2008-02-05 11:38:19.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libvid21394.la + else +-lib_LTLIBRARIES = libvid21394.la ++libcpi_LTLIBRARIES = libvid21394.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + libvid21394_la_LDFLAGS = + +--- unicap-0.2.19/libunicapgtk/Makefile.am 2007-08-30 07:55:42.000000000 +0200 ++++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir 2008-02-05 11:39:08.000000000 +0100 +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@ +-AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" ++AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" + + if BUILD_UNICAPGTK + UNICAPGTK_LIB=libunicapgtk.la diff --git a/unicap.spec b/unicap.spec new file mode 100644 index 0000000..98fccd1 --- /dev/null +++ b/unicap.spec @@ -0,0 +1,85 @@ +Summary: Library to access different kinds of (video) capture devices +Name: unicap +Version: 0.2.19 +Release: 3%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://www.unicap-imaging.org/ +Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Patch: unicap-0.2.19-libdir.patch +BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext +BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel +BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 +BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel +BuildRequires: automake, libtool +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Unicap provides a uniform interface to video capture devices. It allows +applications to use any supported video capture device via a single API. +The included ucil library provides easy to use functions to render text +and graphic overlays onto video images. + +%package devel +Summary: Development files for the unicap library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +The unicap-devel package includes header files and libraries necessary for +for developing programs which use the unicap, unicapgtk and ucil library. It +contains the API documentation of the library, too. + +%prep +%setup -q +%patch -p1 -b .libdir +aclocal -I m4 +autoconf +automake -a + +%build +%configure --disable-rpath --enable-gtk-doc + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# Don't install any static .a and libtool .la files +rm -f $RPM_BUILD_ROOT%{_libdir}/{,unicap2/cpi/}*.{a,la} + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING README +%{_libdir}/*.so.* +%dir %{_libdir}/unicap2 +%dir %{_libdir}/unicap2/cpi +%{_libdir}/unicap2/cpi/*.so.* + +%files devel +%defattr(-,root,root) +%doc examples +%{_libdir}/*.so +%{_libdir}/unicap2/cpi/*.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/%{name} +%{_datadir}/gtk-doc/html/* + +%changelog +* Sat Feb 16 2008 Robert Scheck 0.2.19-3 +- Added patch to correct libdir paths (thanks to Ralf Corsepius) + +* Mon Feb 04 2008 Robert Scheck 0.2.19-2 +- Changes to match with Fedora Packaging Guidelines (#431381) + +* Mon Feb 04 2008 Robert Scheck 0.2.19-1 +- Upgrade to 0.2.19 +- Initial spec file for Fedora and Red Hat Enterprise Linux From 7e65eb518a46c3ece4a0dc977355212807c144c9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 17 May 2008 21:13:05 +0000 Subject: [PATCH 3/7] Upgrade to 0.2.22 (#446021) --- .cvsignore | 2 +- sources | 2 +- unicap-0.2.19-libdir.patch | 87 -------------------------------------- unicap-0.2.22-ia64.patch | 22 ++++++++++ unicap.spec | 11 +++-- 5 files changed, 31 insertions(+), 93 deletions(-) delete mode 100644 unicap-0.2.19-libdir.patch create mode 100644 unicap-0.2.22-ia64.patch diff --git a/.cvsignore b/.cvsignore index 0c9f421..ac9e7f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.19.tar.gz +unicap-0.2.22.tar.gz diff --git a/sources b/sources index 9d69924..be4951f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ab0a533f5c1ff3a24853d2564ffb14f unicap-0.2.19.tar.gz +52c9feb759227a9cfac95f2f68635dab unicap-0.2.22.tar.gz diff --git a/unicap-0.2.19-libdir.patch b/unicap-0.2.19-libdir.patch deleted file mode 100644 index e65f7b5..0000000 --- a/unicap-0.2.19-libdir.patch +++ /dev/null @@ -1,87 +0,0 @@ -Patch by Ralf Corsepius for unicap >= 0.2.19, which causes the use -of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used. - ---- unicap-0.2.19/cpi/dcam/Makefile.am 2007-08-02 22:29:53.000000000 +0200 -+++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir 2008-02-05 11:35:57.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libdcam.la - else --lib_LTLIBRARIES = libdcam.la -+libcpi_LTLIBRARIES = libdcam.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@ - ---- unicap-0.2.19/cpi/thing/Makefile.am 2006-04-16 22:02:55.000000000 +0200 -+++ unicap-0.2.19/cpi/thing/Makefile.am.libdir 2008-02-05 11:36:58.000000000 +0100 -@@ -1,9 +1,9 @@ - MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I../include -I../../include - --lib_LTLIBRARIES = libthing.la -+libcpi_LTLIBRARIES = libthing.la - --libdir = $(prefix)/lib/unicap/cpi -+libcpidir = $(libdir)/unicap/cpi - - - libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ ---- unicap-0.2.19/cpi/v4l/Makefile.am 2007-08-02 22:30:32.000000000 +0200 -+++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir 2008-02-05 11:37:23.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libv4l.la - else --lib_LTLIBRARIES = libv4l.la -+libcpi_LTLIBRARIES = libv4l.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - - libv4l_la_LDFLAGS = ---- unicap-0.2.19/cpi/v4l2/Makefile.am 2008-02-02 16:07:46.000000000 +0100 -+++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir 2008-02-05 11:36:25.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libv4l2.la - else --lib_LTLIBRARIES = libv4l2.la -+libcpi_LTLIBRARIES = libv4l2.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - - libv4l2_la_LDFLAGS = ---- unicap-0.2.19/cpi/vid21394/Makefile.am 2007-08-02 22:29:34.000000000 +0200 -+++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir 2008-02-05 11:38:19.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libvid21394.la - else --lib_LTLIBRARIES = libvid21394.la -+libcpi_LTLIBRARIES = libvid21394.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - libvid21394_la_LDFLAGS = - ---- unicap-0.2.19/libunicapgtk/Makefile.am 2007-08-30 07:55:42.000000000 +0200 -+++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir 2008-02-05 11:39:08.000000000 +0100 -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@ --AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" -+AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" - - if BUILD_UNICAPGTK - UNICAPGTK_LIB=libunicapgtk.la diff --git a/unicap-0.2.22-ia64.patch b/unicap-0.2.22-ia64.patch new file mode 100644 index 0000000..207ab28 --- /dev/null +++ b/unicap-0.2.22-ia64.patch @@ -0,0 +1,22 @@ +Patch by Yi Zhan for unicap >= 0.2.19, which causes a working make without segmentation +fault on IA64 (Itanium 2). See https://bugzilla.redhat.com/show_bug.cgi?id=446021 for further information. + +--- unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types 2008-02-02 15:20:55.000000000 +0000 ++++ unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types.ia64 2008-05-12 05:24:27.000000000 +0000 +@@ -1,4 +1,5 @@ + #include ++#include + + unicapgtk_video_display_get_type + unicapgtk_device_property_get_type +--- unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am 2007-07-06 05:40:51.000000000 +0000 ++++ unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am.ia64 2008-05-12 05:25:13.000000000 +0000 +@@ -67,7 +67,7 @@ + # signals and properties. + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +-INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) ++INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libunicapgtk -I$(top_srcdir)/include + GTKDOC_LIBS=`pkg-config --libs gtk+-2.0` -L$(top_builddir)/libunicapgtk/.libs/ -lunicapgtk + + # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/unicap.spec b/unicap.spec index 98fccd1..c6944a7 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,12 +1,12 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.19 -Release: 3%{?dist} +Version: 0.2.22 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Patch: unicap-0.2.19-libdir.patch +Patch: unicap-0.2.22-ia64.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 @@ -32,7 +32,7 @@ contains the API documentation of the library, too. %prep %setup -q -%patch -p1 -b .libdir +%patch -p1 -b .ia64 aclocal -I m4 autoconf automake -a @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sat May 17 2008 Robert Scheck 0.2.22-1 +- Upgrade to 0.2.22 (#446021) + * Sat Feb 16 2008 Robert Scheck 0.2.19-3 - Added patch to correct libdir paths (thanks to Ralf Corsepius) From b38318d6836fbb2568267d8c830e87aed747a72f Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 15:55:44 +0000 Subject: [PATCH 4/7] - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) --- .cvsignore | 2 +- sources | 2 +- unicap-0.2.22-ia64.patch | 22 ---------------------- unicap.spec | 16 ++++++---------- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 unicap-0.2.22-ia64.patch diff --git a/.cvsignore b/.cvsignore index ac9e7f7..4841f31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.22.tar.gz +unicap-0.2.23.tar.gz diff --git a/sources b/sources index be4951f..6f65583 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52c9feb759227a9cfac95f2f68635dab unicap-0.2.22.tar.gz +e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz diff --git a/unicap-0.2.22-ia64.patch b/unicap-0.2.22-ia64.patch deleted file mode 100644 index 207ab28..0000000 --- a/unicap-0.2.22-ia64.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch by Yi Zhan for unicap >= 0.2.19, which causes a working make without segmentation -fault on IA64 (Itanium 2). See https://bugzilla.redhat.com/show_bug.cgi?id=446021 for further information. - ---- unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types 2008-02-02 15:20:55.000000000 +0000 -+++ unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types.ia64 2008-05-12 05:24:27.000000000 +0000 -@@ -1,4 +1,5 @@ - #include -+#include - - unicapgtk_video_display_get_type - unicapgtk_device_property_get_type ---- unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am 2007-07-06 05:40:51.000000000 +0000 -+++ unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am.ia64 2008-05-12 05:25:13.000000000 +0000 -@@ -67,7 +67,7 @@ - # signals and properties. - # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) --INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -+INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libunicapgtk -I$(top_srcdir)/include - GTKDOC_LIBS=`pkg-config --libs gtk+-2.0` -L$(top_builddir)/libunicapgtk/.libs/ -lunicapgtk - - # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/unicap.spec b/unicap.spec index c6944a7..5a628f6 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.22 +Version: 0.2.23 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -11,7 +11,6 @@ BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel -BuildRequires: automake, libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,10 +31,6 @@ contains the API documentation of the library, too. %prep %setup -q -%patch -p1 -b .ia64 -aclocal -I m4 -autoconf -automake -a %build %configure --disable-rpath --enable-gtk-doc @@ -60,20 +55,21 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README %{_libdir}/*.so.* -%dir %{_libdir}/unicap2 -%dir %{_libdir}/unicap2/cpi -%{_libdir}/unicap2/cpi/*.so.* +%{_libdir}/unicap2 %files devel %defattr(-,root,root) %doc examples %{_libdir}/*.so -%{_libdir}/unicap2/cpi/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/%{name} %{_datadir}/gtk-doc/html/* %changelog +* Mon May 19 2008 Robert Scheck 0.2.23-1 +- Upgrade to 0.2.23 +- Corrected packaging of cpi/*.so files (thanks to Arne Caspari) + * Sat May 17 2008 Robert Scheck 0.2.22-1 - Upgrade to 0.2.22 (#446021) From ae3494eddfaf74ae509beaab308cb598a978c5b3 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 16:08:08 +0000 Subject: [PATCH 5/7] Removed the already removed patch from spec file --- unicap.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/unicap.spec b/unicap.spec index 5a628f6..f34b0ad 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,7 +6,6 @@ License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Patch: unicap-0.2.22-ia64.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 From d9b89a07de5ccbf3fad6a749a79352232ad8f73d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:32 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 20fec0d..383f3ff 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: unicap -# $Id$ +# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ NAME := unicap 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 d53bf0c5ef018ee900669ae64ae002355a9864fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:42:29 +0000 Subject: [PATCH 7/7] 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 383f3ff..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: unicap -# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ -NAME := unicap -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7