robert pushed to libunicap (master). "- Added patch to avoid a /usr/@DATADIRNAME@/locale/ directory (..more)"

[notifications at fedoraproject.org]

From 04792f4ff0a43d3de7eb3d18b60ba974339eb76b Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Sun, 31 May 2015 21:59:19 +0200
Subject: - Added patch to avoid a /usr/@DATADIRNAME@/locale/ directory - Use
 %{_udevrulesdir} macro rather /etc/udev/rules.d/ (#1226681)


diff --git a/libunicap-0.9.12-datadirname.patch b/libunicap-0.9.12-datadirname.patch
new file mode 100644
index 0000000..f208d48
--- /dev/null
+++ b/libunicap-0.9.12-datadirname.patch
@@ -0,0 +1,14 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for libunicap <= 0.9.12 to work around
+the issue of /usr/@DATADIRNAME@/locale/ rather /usr/share/locale/ on Fedora 22 (and newer).
+
+--- libunicap-0.9.12/po/Makefile.in.in			2009-09-21 18:08:22.000000000 +0200
++++ libunicap-0.9.12/po/Makefile.in.in.datadirname	2015-05-31 21:44:58.000000000 +0200
+@@ -33,7 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
++DATADIRNAME = share
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
diff --git a/libunicap.spec b/libunicap.spec
index 9001093..a7e104a 100644
--- a/libunicap.spec
+++ b/libunicap.spec
@@ -7,7 +7,7 @@
 Summary:	Library to access different kinds of (video) capture devices
 Name:		libunicap
 Version:	0.9.12
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.unicap-imaging.org/
@@ -20,6 +20,7 @@ Patch3:		libunicap-0.9.12-warnings.patch
 Patch4:		libunicap-bz641623.patch
 Patch5:		libunicap-bz642118.patch
 Patch6:		libunicap-0.9.12-videodev.patch
+Patch7:		libunicap-0.9.12-datadirname.patch
 BuildRequires:	intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4
 BuildRequires:	glib2-devel >= 2.10.0
 %ifnarch s390 s390x
@@ -28,6 +29,9 @@ BuildRequires:	libraw1394-devel >= 1.1.0
 %if 0%{?rhel}%{?fedora} >= 6
 BuildRequires:	libv4l-devel >= 0.8.3-1, libtool, automake, autoconf
 %endif
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+BuildRequires:	systemd
+%endif
 Obsoletes:	unicap <= 0.9.7-1
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +65,7 @@ API documentation of the library, too.
 %if 0%{?rhel}%{?fedora} >= 7
 %patch6 -p1
 %endif
+%patch7 -p1
 
 # Needed to get rid of rpath
 %if 0%{?rhel}%{?fedora} >= 6
@@ -91,6 +96,12 @@ sed -e 's/\(SYSFS\|ATTRS\)/SYSFS/g' -i $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.
 %endif
 touch -c -r {data,$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d}/50-euvccam.rules
 
+# Move udev rules file to appropriate rules directory
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}/
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-euvccam.rules $RPM_BUILD_ROOT%{_udevrulesdir}/
+%endif
+
 %find_lang unicap
 
 %clean
@@ -103,7 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f unicap.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+%{_udevrulesdir}/50-euvccam.rules
+%else
 %config %{_sysconfdir}/udev/rules.d/50-euvccam.rules
+%endif
 %{_libdir}/%{name}.so.*
 %{_libdir}/unicap2
 
@@ -115,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sun May 31 2015 Robert Scheck <robert at fedoraproject.org> 0.9.12-15
+- Added patch to avoid a /usr/@DATADIRNAME@/locale/ directory
+- Use %%{_udevrulesdir} macro rather /etc/udev/rules.d/ (#1226681)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.12-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libunicap.git/commit/?h=master&id=04792f4ff0a43d3de7eb3d18b60ba974339eb76b