Update to 0.5.4 (bz#628157)

.gitignore

@@ -1,2 +1,3 @@
 libavc1394-0.5.1.tar.gz
 libavc1394-0.5.3.tar.gz
+/libavc1394-0.5.4.tar.gz

libavc1394-0.5.4-librom.patch

@@ -1,7 +1,7 @@
-Index: libavc1394-0.5.3/Makefile.am
+Index: libavc1394-0.5.4/Makefile.am
 ===================================================================
---- libavc1394-0.5.3.orig/Makefile.am
-+++ libavc1394-0.5.3/Makefile.am
+--- libavc1394-0.5.4.orig/Makefile.am
++++ libavc1394-0.5.4/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = common libavc1394 librom1394 test
 +SUBDIRS = common librom1394 libavc1394 test
@@ -10,12 +10,12 @@ Index: libavc1394-0.5.3/Makefile.am
  EXTRA_DIST = libavc1394.pc libavc1394.spec
 Index: libavc1394-0.5.3/Makefile.in
 ===================================================================
---- libavc1394-0.5.3.orig/Makefile.in
-+++ libavc1394-0.5.3/Makefile.in
-@@ -189,7 +189,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- libavc1394-0.5.4.orig/Makefile.in
++++ libavc1394-0.5.4/Makefile.in
+@@ -245,7 +245,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = common libavc1394 librom1394 test
 +SUBDIRS = common librom1394 libavc1394 test
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
@@ -40,11 +40,11 @@ Index: libavc1394-0.5.3/libavc1394/Makefile.am
  pkginclude_HEADERS = avc1394.h avc1394_vcr.h
  INCLUDES = @LIBRAW1394_CFLAGS@
  
-Index: libavc1394-0.5.3/libavc1394/Makefile.in
+Index: libavc1394-0.5.4/libavc1394/Makefile.in
 ===================================================================
---- libavc1394-0.5.3.orig/libavc1394/Makefile.in
-+++ libavc1394-0.5.3/libavc1394/Makefile.in
-@@ -187,12 +187,12 @@ target_alias = @target_alias@
+--- libavc1394-0.5.4.orig/libavc1394/Makefile.in
++++ libavc1394-0.5.4/libavc1394/Makefile.in
+@@ -216,12 +216,12 @@ target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
  lib_LTLIBRARIES = libavc1394.la
  libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
@@ -60,10 +60,10 @@ Index: libavc1394-0.5.3/libavc1394/Makefile.in
  
  pkginclude_HEADERS = avc1394.h avc1394_vcr.h
  INCLUDES = @LIBRAW1394_CFLAGS@
-Index: libavc1394-0.5.3/librom1394/Makefile.am
+Index: libavc1394-0.5.4/librom1394/Makefile.am
 ===================================================================
---- libavc1394-0.5.3.orig/librom1394/Makefile.am
-+++ libavc1394-0.5.3/librom1394/Makefile.am
+--- libavc1394-0.5.4.orig/librom1394/Makefile.am
++++ libavc1394-0.5.4/librom1394/Makefile.am
 @@ -1,7 +1,7 @@
  MAINTAINERCLEANFILES = Makefile.in
  lib_LTLIBRARIES = librom1394.la
@@ -75,9 +75,9 @@ Index: libavc1394-0.5.3/librom1394/Makefile.am
  	rom1394_main.c \
 Index: libavc1394-0.5.3/librom1394/Makefile.in
 ===================================================================
---- libavc1394-0.5.3.orig/librom1394/Makefile.in
-+++ libavc1394-0.5.3/librom1394/Makefile.in
-@@ -186,7 +186,7 @@ target_alias = @target_alias@
+--- libavc1394-0.5.4.orig/librom1394/Makefile.in
++++ libavc1394-0.5.4/librom1394/Makefile.in
+@@ -215,7 +215,7 @@ target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
  lib_LTLIBRARIES = librom1394.la
  librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \

libavc1394.spec

@@ -1,14 +1,15 @@
 Summary:        Audio/Video Control library for IEEE-1394 devices
 Name:           libavc1394
-Version:        0.5.3
-Release:        19%{?dist}
+Version:        0.5.4
+Release:        1%{?dist}
 License:        GPLv2+ and LGPLv2+
-Group:          System Environment/Libraries
 URL:            http://sourceforge.net/projects/libavc1394/
-Source:         http://downloads.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
-Patch1:         libavc1394-0.5.3-librom.patch
+Source:         https://sourceforge.net/projects/libavc1394/files/libavc1394/libavc1394-%{version}.tar.gz
+Patch1:         libavc1394-%{version}-librom.patch
 BuildRequires:  libraw1394-devel
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:  chrpath
+
+# libraw1394 is not built on s390*
 ExcludeArch:    s390 s390x
 
 %description
@@ -18,8 +19,8 @@ to control devices like the tape on a VCR or camcorder.
 
 %package devel
 Summary: Development libs for libavc1394
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+
+Requires: %{name}%{?isa} = %{version}-%{release}
 Requires: libraw1394-devel, pkgconfig
 
 %description devel
@@ -32,26 +33,22 @@ chmod -x test/dvcont.c
 
 %build
 %configure
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+%make_install
 # sigh, --disable-static doesn't work
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+chrpath -d $RPM_BUILD_ROOT%{_libdir}/lib*
+chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog TODO
+%doc AUTHORS NEWS README ChangeLog TODO
+%license COPYING
 # binaries are GPLv2+
 %{_bindir}/dvcont
 %{_bindir}/mkrfc2734
@@ -63,16 +60,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libavc1394.so.*
 %{_libdir}/librom1394.so.*
 
-
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/libavc1394/
 %{_libdir}/pkgconfig/libavc1394.pc
 %{_libdir}/libavc1394.so
 %{_libdir}/librom1394.so
 
-
 %changelog
+* Sat Aug 20 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-1
+- Update to 0.5.4 (bz#628157)
+- Patch updated
+- Use %%license
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

sources

@@ -1 +1 @@
-09e30b1fb5ae455b6d8407e457a711a3  libavc1394-0.5.3.tar.gz
+caf0db059d8b8d35d6f08e6c0e1c7dfe  libavc1394-0.5.4.tar.gz