SPECS: libnjb.spec - lib64 hack obsoleted; header file to subdir

[zbyniu]

Author: zbyniu                       Date: Fri May  5 16:28:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lib64 hack obsoleted; header file to subdir

---- Files affected:
SPECS:
   libnjb.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/libnjb.spec
diff -u SPECS/libnjb.spec:1.15 SPECS/libnjb.spec:1.16
--- SPECS/libnjb.spec:1.15	Fri May  5 16:29:40 2006
+++ SPECS/libnjb.spec	Fri May  5 18:28:42 2006
@@ -70,12 +70,8 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%if "%{_lib}" != "lib"
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/libnjb.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/libnjb.pc
-%endif
+	DESTDIR=$RPM_BUILD_ROOT \
+	includedir=%{_includedir}/%{name}
 
 install nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 install nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
@@ -94,9 +90,9 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnjb.so
-%attr(755,root,root) %{_libdir}/libnjb.so.*
+%attr(755,root,root) %{_libdir}/libnjb.so.?
 %{_libdir}/libnjb.la
-%{_includedir}/*
+%{_includedir}/%{name}
 %{_pkgconfigdir}/*.pc
 
 %files static
@@ -109,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/05/05 16:28:42  zbyniu
+- lib64 hack obsoleted; header file to subdir
+
 Revision 1.15  2006/05/05 14:29:40  zbyniu
 - removed unneeded patches; CC, CFLAGS; proper %files; todo added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libnjb.spec?r1=1.15&r2=1.16&f=u