[packages/libnjb] - simplified docs patch, moved doxygen docs to -apidocs - drop .la file (.pc exists and it's safe -

[qboosh]

commit 3d32d59d25acc514c04592f613ac8c1b2ef180c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jan 17 21:42:31 2014 +0100

    - simplified docs patch, moved doxygen docs to -apidocs
    - drop .la file (.pc exists and it's safe - no existing package in Th requires it)
    - don't install hotplug files just to omit them later (added hotplug bcond if sb really wants them)

 docs.patch  |  5 ++---
 libnjb.spec | 32 ++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)
---
diff --git a/libnjb.spec b/libnjb.spec
index e82d635..16f5a61 100644
--- a/libnjb.spec
+++ b/libnjb.spec
@@ -1,6 +1,8 @@
+# TODO: udev support?
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
+%bcond_with	hotplug		# old-style hotplug support in -utils
 #
 Summary:	API interface to talk to Zen Creative devices
 Summary(pl.UTF-8):	Interfejs API do komunikacji z urządzeniami Zen Creative
@@ -62,6 +64,17 @@ Static njb library.
 %description static -l pl.UTF-8
 Statyczna biblioteka njb.
 
+%package apidocs
+Summary:	API documentation for njb library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki njb
+Group:		Documentation
+
+%description apidocs
+API documentation for njb library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki njb.
+
 %package utils
 Summary:	njb utilities
 Summary(pl.UTF-8):	Narzędzia njb
@@ -98,8 +111,13 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 	DESTDIR=$RPM_BUILD_ROOT \
 	includedir=%{_includedir}/%{name}
 
+# 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
@@ -115,11 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html/*
 %attr(755,root,root) %{_libdir}/libnjb.so
-%{_libdir}/libnjb.la
 %{_includedir}/%{name}
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libnjb.pc
 
 %if %{with static_libs}
 %files static
@@ -127,6 +143,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnjb.a
 %endif
 
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
+
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/njb*
+%attr(755,root,root) %{_bindir}/njb-*
+%if %{with hotplug}
+%attr(755,root,root) %{_sysconfdir}/hotplug/usb/nomadjukebox
+%{_sysconfdir}/hotplug/usb/nomad.usermap
+%endif
diff --git a/docs.patch b/docs.patch
index d5997dc..3054fd2 100644
--- a/docs.patch
+++ b/docs.patch
@@ -1,12 +1,11 @@
 --- libnjb-2.2.7/doc/Makefile.am.orig	2007-11-11 01:06:29.000000000 +0100
 +++ libnjb-2.2.7/doc/Makefile.am	2014-01-15 12:55:10.046268288 +0100
-@@ -8,8 +8,7 @@ all-local:
+@@ -8,8 +8,5 @@ all-local:
  	doxygen
  
- install-data-local:
+-install-data-local:
 -	$(INSTALL) -d $(DESTDIR)$(htmldocdir)
 -	$(INSTALL_DATA) html/* $(DESTDIR)$(htmldocdir)
-+	true
  
  uninstall-local:
  	$(RM) -r $(DESTDIR)$(htmldocdir)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libnjb.git/commitdiff/3667117922b8e8df0c705f34a7b6090dd88d81c1