SPECS: libnjb.spec - added libnjb-Makefile.patch - fixed build - a...

[paszczus]

Author: paszczus                     Date: Fri May  5 14:03:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added libnjb-Makefile.patch
- fixed build
- added files
- release 1

---- Files affected:
SPECS:
   libnjb.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/libnjb.spec
diff -u SPECS/libnjb.spec:1.13 SPECS/libnjb.spec:1.14
--- SPECS/libnjb.spec:1.13	Fri May  5 15:11:48 2006
+++ SPECS/libnjb.spec	Fri May  5 16:03:24 2006
@@ -3,12 +3,13 @@
 Summary(pl):	Interfejs API do komunikacji z urządzeniami Zen Creative
 Name:		libnjb
 Version:	2.2.5
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/libnjb/%{name}-%{version}.tar.gz
 # Source0-md5:	f7461574b9a28ed1c79fb40d3d307d78
 Patch0:		%{name}-ncurses.patch
+Patch1:		%{name}-Makefile.patch
 URL:		http://libnjb.sourceforge.net/
 BuildRequires:	libusb-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,6 +57,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -68,7 +70,8 @@
 %{__make} install \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	libdir=$RPM_BUILD_ROOT%{_libdir} \
-	includedir=$RPM_BUILD_ROOT%{_includedir}/libnjb
+	includedir=$RPM_BUILD_ROOT%{_includedir}/libnjb \
+	bindir=$RPM_BUILD_ROOT%{_bindir} \
 
 %if "%{_lib}" != "lib"
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -86,12 +89,12 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES FAQ HACKING README
-%attr(755,root,root) %{_libdir}/libnjb-2.0.so
+%doc AUTHORS ChangeLog FAQ HACKING README
+%attr(755,root,root) %{_libdir}/libnjb.so*.*
+%attr(755,root,root) %{_bindir}/njb-*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnjb.so
 %{_libdir}/libnjb.la
 %{_includedir}/libnjb
 %{_pkgconfigdir}/*.pc
@@ -106,6 +109,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/05/05 14:03:24  paszczus
+- added libnjb-Makefile.patch
+- fixed build
+- added files
+- release 1
+
 Revision 1.13  2006/05/05 13:11:48  paszczus
 - updated to 2.2.5
 - added libnjb-ncurses.patch
================================================================

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