diff --git a/.cvsignore b/.cvsignore index 9760e44..35e953c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ libiec61883-1.0.0.tar.gz libiec61883-1.1.0.tar.gz +libiec61883-1.2.0.tar.gz diff --git a/libiec61883-1.1.0-installtests.patch b/libiec61883-1.1.0-installtests.patch deleted file mode 100644 index 6fb5338..0000000 --- a/libiec61883-1.1.0-installtests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libiec61883-1.1.0.orig/examples/Makefile.am libiec61883-1.1.0/examples/Makefile.am ---- libiec61883-1.1.0.orig/examples/Makefile.am 2006-09-24 15:34:12.000000000 -0400 -+++ libiec61883-1.1.0/examples/Makefile.am 2006-10-25 13:12:38.000000000 -0400 -@@ -1,6 +1,6 @@ - --noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs --bin_PROGRAMS = plugreport plugctl -+noinst_PROGRAMS = -+bin_PROGRAMS = plugreport plugctl test-amdtp test-dv test-mpeg2 test-plugs - man_MANS = plugreport.1 plugctl.1 - EXTRA_DIST = plugreport.1 plugctl.1 - diff --git a/libiec61883-1.2.0-installtests.patch b/libiec61883-1.2.0-installtests.patch new file mode 100644 index 0000000..6f62e23 --- /dev/null +++ b/libiec61883-1.2.0-installtests.patch @@ -0,0 +1,28 @@ +diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.am libiec61883-1.2.0/examples/Makefile.am +--- libiec61883-1.2.0.orig/examples/Makefile.am 2006-09-24 15:34:12.000000000 -0400 ++++ libiec61883-1.2.0/examples/Makefile.am 2009-01-15 10:29:02.265594991 -0500 +@@ -1,6 +1,6 @@ + +-noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs +-bin_PROGRAMS = plugreport plugctl ++noinst_PROGRAMS = ++bin_PROGRAMS = plugreport plugctl test-amdtp test-dv test-mpeg2 test-plugs + man_MANS = plugreport.1 plugctl.1 + EXTRA_DIST = plugreport.1 plugctl.1 + +diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.in libiec61883-1.2.0/examples/Makefile.in +--- libiec61883-1.2.0.orig/examples/Makefile.in 2009-01-15 01:33:33.000000000 -0500 ++++ libiec61883-1.2.0/examples/Makefile.in 2009-01-15 10:28:57.088402078 -0500 +@@ -32,9 +32,10 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = test-amdtp$(EXEEXT) test-dv$(EXEEXT) \ ++noinst_PROGRAMS = ++bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) \ ++ test-amdtp$(EXEEXT) test-dv$(EXEEXT) \ + test-mpeg2$(EXEEXT) test-plugs$(EXEEXT) +-bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) + subdir = examples + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/libiec61883.spec b/libiec61883.spec index 8c0e116..8648c08 100644 --- a/libiec61883.spec +++ b/libiec61883.spec @@ -1,18 +1,18 @@ Summary: Streaming library for IEEE1394 Name: libiec61883 -Version: 1.1.0 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz -Patch: libiec61883-1.1.0-installtests.patch +Patch0: libiec61883-1.2.0-installtests.patch +Patch1: libiec61883-channel-allocation-without-local-node-rw.patch URL: http://linux1394.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ExcludeArch: s390 s390x # Works only with newer libraw1394 versions BuildRequires: libraw1394-devel >= 1.2.1 -BuildRequires: autoconf, automake, libtool Requires: libraw1394 >= 1.2.1 %description @@ -42,10 +42,10 @@ Utilities that make use of iec61883 %prep %setup -q -%patch -p1 -b .installtests +%patch0 -p1 +%patch1 -p1 %build -autoreconf export CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} @@ -81,32 +81,37 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/*.1* %changelog +* Thu Jan 15 2009 Jarod Wilson 1.2.0-1 +- Update to libiec61883 v1.2.0 release +- Rework installtests patch to not require reautoconf +- Make iso channel allocation work w/o local fw node r/w + * Tue Jul 22 2008 Jarod Wilson 1.1.0-5 - Bump and rebuild for libraw1394 v2.0.0 -* Thu Feb 14 2008 Jarod Wilson - 1.1.0-4 +* Thu Feb 14 2008 Jarod Wilson 1.1.0-4 - Bump and rebuild with gcc 4.3 -* Wed Dec 19 2007 Jarod Wilson - 1.1.0-3 +* Wed Dec 19 2007 Jarod Wilson 1.1.0-3 - Fix license and group tags (#411201) - Clean up spacing and macro/var inconsistency -* Mon Mar 26 2007 Jarod Wilson - 1.1.0-2 +* Mon Mar 26 2007 Jarod Wilson 1.1.0-2 - Own created directories (#233865) -* Wed Oct 25 2006 Jarod Wilson - 1.1.0-1 +* Wed Oct 25 2006 Jarod Wilson 1.1.0-1 - Update to 1.1.0 release -* Wed Oct 11 2006 Jarod Wilson - 1.0.0-11 +* Wed Oct 11 2006 Jarod Wilson 1.0.0-11 - Use %%dist tag -* Wed Jul 12 2006 Jesse Keating - 1.0.0-10.fc5.2.1 +* Wed Jul 12 2006 Jesse Keating 1.0.0-10.fc5.2.1 - rebuild -* Fri Feb 10 2006 Jesse Keating - 1.0.0-10.fc5.2 +* Fri Feb 10 2006 Jesse Keating 1.0.0-10.fc5.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.0-10.fc5.1 +* Tue Feb 07 2006 Jesse Keating 1.0.0-10.fc5.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 30 2005 Jarod Wilson 1.0.0-10 diff --git a/sources b/sources index 2d6ce48..350359c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 08f46840912ae2032499186228842a32 libiec61883-1.1.0.tar.gz +8af39fff74988073c3ad53fbab147da9 libiec61883-1.2.0.tar.gz