[packages/libnjb] - completed BRs, handle hotplug as configure switch
qboosh
qboosh at pld-linux.org
Fri Jan 17 21:45:54 CET 2014
commit 3667117922b8e8df0c705f34a7b6090dd88d81c1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jan 17 21:46:53 2014 +0100
- completed BRs, handle hotplug as configure switch
libnjb.spec | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/libnjb.spec b/libnjb.spec
index 16f5a61..c463179 100644
--- a/libnjb.spec
+++ b/libnjb.spec
@@ -15,12 +15,13 @@ Source0: http://downloads.sourceforge.net/libnjb/%{name}-%{version}.tar.gz
# Source0-md5: 73f25f3297abe316dd0abec921781d50
Patch0: docs.patch
URL: http://libnjb.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: libusb-compat-devel
BuildRequires: ncurses-devel
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -98,6 +99,7 @@ Narzędzia dla biblioteki njb.
%{__autoheader}
%{__automake}
%configure \
+ %{?with_hotplug:--enable-hotplugging} \
%{!?with_static_libs:--disable-static}
%{__make} \
CC="%{__cc}" \
@@ -105,7 +107,6 @@ Narzędzia dla biblioteki njb.
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -114,11 +115,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnjb.la
-%if %{with hotplug}
-install nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -151,6 +147,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/njb-*
%if %{with hotplug}
-%attr(755,root,root) %{_sysconfdir}/hotplug/usb/nomadjukebox
-%{_sysconfdir}/hotplug/usb/nomad.usermap
+%attr(755,root,root) /etc/hotplug/usb/nomadjukebox
+/etc/hotplug/usb/nomad.usermap
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libnjb.git/commitdiff/3667117922b8e8df0c705f34a7b6090dd88d81c1
More information about the pld-cvs-commit
mailing list