[libgphoto2] Use _udevrulesdir macro.
Tim Waugh
twaugh at fedoraproject.org
Tue Apr 23 15:41:04 UTC 2013
commit fbe46a8dce3147df7407a660909b442082804fdd
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Apr 23 16:22:11 2013 +0100
Use _udevrulesdir macro.
libgphoto2.spec | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 5690845..9fb27f2 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -3,7 +3,7 @@
Summary: Library for accessing digital cameras
Name: libgphoto2
Version: 2.5.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
Group: Development/Libraries
@@ -22,6 +22,7 @@ BuildRequires: libjpeg-devel
BuildRequires: pkgconfig, sharutils
BuildRequires: libtool-ltdl-devel, popt-devel
BuildRequires: gd-devel
+BuildRequires: systemd
Obsoletes: gphoto2 < 2.4.0-11
Obsoletes: gphoto2-devel < 2.4.0-11
@@ -112,10 +113,8 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
# Output udev rules for device identification; this is used by GVfs gphoto2
# backend and others.
#
-# Btw, since it's /lib/udev, never e.g. /lib64/udev, we hardcode the path
-#
-mkdir -p $RPM_BUILD_ROOT%{udevdir}/rules.d
-$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT%{udevdir}/rules.d/40-libgphoto2.rules
+mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
+$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules
popd
# remove circular symlink in /usr/include/gphoto2 (#460807)
@@ -146,7 +145,7 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_libdir}/libgphoto2_port/*/*.so
%{_libdir}/libgphoto2/*/*.so
%{_libdir}/*.so.*
-%{udevdir}/rules.d/40-libgphoto2.rules
+%{_udevrulesdir}/40-libgphoto2.rules
%{udevdir}/check-ptp-camera
%post -p /sbin/ldconfig
@@ -165,6 +164,9 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_mandir}/man3/*
%changelog
+* Tue Apr 23 2013 Tim Waugh <twaugh at redhat.com> 2.5.1.1-2
+- Use _udevrulesdir macro.
+
* Tue Feb 19 2013 Jindrich Novy <jnovy at redhat.com> 2.5.1.1-1
- update to 2.5.1.1
More information about the scm-commits
mailing list