SPECS: libnjb.spec - removed unneeded patches; CC, CFLAGS; proper ...

[zbyniu]

Author: zbyniu                       Date: Fri May  5 14:29:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed unneeded patches; CC, CFLAGS; proper %files; todo added

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

---- Diffs:

================================================================
Index: SPECS/libnjb.spec
diff -u SPECS/libnjb.spec:1.14 SPECS/libnjb.spec:1.15
--- SPECS/libnjb.spec:1.14	Fri May  5 16:03:24 2006
+++ SPECS/libnjb.spec	Fri May  5 16:29:40 2006
@@ -1,17 +1,19 @@
 # $Revision$, $Date$
+#
+# TODO: -utils subpackage? if not, remove ncurses dependence
+#
 Summary:	API interface to talk to Zen Creative devices
 Summary(pl):	Interfejs API do komunikacji z urządzeniami Zen Creative
 Name:		libnjb
 Version:	2.2.5
-Release:	1
+Release:	0.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
+BuildRequires:	ncurses-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,22 +58,19 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
-%{__make}
+%{__make} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 
 %{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	libdir=$RPM_BUILD_ROOT%{_libdir} \
-	includedir=$RPM_BUILD_ROOT%{_includedir}/libnjb \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %if "%{_lib}" != "lib"
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -90,13 +89,14 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FAQ HACKING README
-%attr(755,root,root) %{_libdir}/libnjb.so*.*
-%attr(755,root,root) %{_bindir}/njb-*
+%attr(755,root,root) %{_libdir}/libnjb.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnjb.so
+%attr(755,root,root) %{_libdir}/libnjb.so.*
 %{_libdir}/libnjb.la
-%{_includedir}/libnjb
+%{_includedir}/*
 %{_pkgconfigdir}/*.pc
 
 %files static
@@ -109,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/05/05 14:29:40  zbyniu
+- removed unneeded patches; CC, CFLAGS; proper %files; todo added
+
 Revision 1.14  2006/05/05 14:03:24  paszczus
 - added libnjb-Makefile.patch
 - fixed build
================================================================

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