packages: libraw/libraw.spec - Version: 0.10.0 (stable) - pkgconfig files i...

[jajcus]

Author: jajcus                       Date: Mon Sep  6 11:04:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 0.10.0 (stable)
- pkgconfig files included
- static libraries moved to -devel, as these are the only available
- samples moved to -samples subpackage

---- Files affected:
packages/libraw:
   libraw.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/libraw/libraw.spec
diff -u packages/libraw/libraw.spec:1.2 packages/libraw/libraw.spec:1.3
--- packages/libraw/libraw.spec:1.2	Mon Aug  2 22:37:27 2010
+++ packages/libraw/libraw.spec	Mon Sep  6 13:04:45 2010
@@ -1,20 +1,19 @@
 # $Revision$, $Date$
 # TODO:
 # - Docs
-# - Figure out how to tell pkgconfig about this library
 # - Get upstream to include proper configure!
 
 %define _packname LibRaw
-%define _beta Beta3
 
 Summary:	LibRaw is a library for reading RAW files
 Name:		libraw
 Version:	0.10.0
-Release:	0.%{_beta}.1
+Release:	1
 License:	LGPL 2.1 / CDDL 1.0 / LibRaw Software License
 Group:		Libraries
-Source0:	http://www.libraw.org/data/%{_packname}-%{version}-%{_beta}.tar.gz
-# Source0-md5:	538acaec5393f0add413bf1a676b0817
+Source0:	http://www.libraw.org/data/%{_packname}-%{version}.tar.gz
+# Source0-md5:	248456748c8310c99c3593bfa6bf71be
+Patch0:		%{name}-pkgconfig.patch
 URL:		http://www.libraw.org
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,13 +26,19 @@
 future. The users of the library are provided with API to be built
 into their software programs.
 
+%package samples
+Summary:	libraw sample programs
+Group:		Applications
+
+%description samples
+LibRaw sample programs.
+
 %package devel
-Summary:	Header files for libraw
+Summary:	Header files for LibRaw
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Header files for FOO library.
+Static libraries and header files for LibRaw.
 
 %package static
 Summary:	Static libraw library
@@ -44,7 +49,8 @@
 Static FOO library.
 
 %prep
-%setup -q -n %{_packname}-%{version}-%{_beta}
+%setup -q -n %{_packname}-%{version}
+%patch0 -p1
 
 %build
 %{__make}
@@ -55,10 +61,11 @@
 #%{__make} install \
 	#DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/usr/{include,lib,bin}
-cp -R libraw $RPM_BUILD_ROOT/usr/include
-cp lib/libraw.a $RPM_BUILD_ROOT/usr/lib
-cp bin/[a-z]* $RPM_BUILD_ROOT/usr/bin
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},%{_pkgconfigdir}}
+cp -R libraw $RPM_BUILD_ROOT%{_includedir}
+install lib/libraw{,_r}.a $RPM_BUILD_ROOT%{_libdir}
+install bin/[a-z]* $RPM_BUILD_ROOT%{_bindir}
+install *.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,17 +73,25 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files
+%files samples
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/libraw
+%{_pkgconfigdir}/libraw.pc
+%{_pkgconfigdir}/libraw_r.pc
+%{_libdir}/libraw.a
+%{_libdir}/libraw_r.a
 
+%if 0
+# only static library built, included in the -devel package
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libraw.a
+%{_libdir}/libraw_r.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +99,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/09/06 11:04:45  jajcus
+- Version: 0.10.0 (stable)
+- pkgconfig files included
+- static libraries moved to -devel, as these are the only available
+- samples moved to -samples subpackage
+
 Revision 1.2  2010/08/02 20:37:27  caleb
 - Up to 0.10.0-Beta3, NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libraw/libraw.spec?r1=1.2&r2=1.3&f=u