SPECS: crossmingw32-cairomm.spec - cleanup, separated -static,-dll

[qboosh]

Author: qboosh                       Date: Tue Mar  6 21:47:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, separated -static,-dll

---- Files affected:
SPECS:
   crossmingw32-cairomm.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-cairomm.spec
diff -u SPECS/crossmingw32-cairomm.spec:1.2 SPECS/crossmingw32-cairomm.spec:1.3
--- SPECS/crossmingw32-cairomm.spec:1.2	Mon Mar  5 12:47:26 2007
+++ SPECS/crossmingw32-cairomm.spec	Tue Mar  6 22:47:26 2007
@@ -6,17 +6,17 @@
 Version:	1.2.4
 Release:	1
 License:	LGPL v2+
-Group:		Libraries
+Group:		Development/Libraries
 Source0:	http://cairographics.org/releases/%{_realname}-%{version}.tar.gz
 # Source0-md5:	5d862facfbd0098c9bae618b61f7c8e6
-Patch0:		%{name}-noexamples.patch
 URL:		http://cairographics.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	crossmingw32-cairo >= 1.2.2
 BuildRequires:	crossmingw32-gcc-c++
-BuildRequires:	crossmingw32-pkgconfig
 BuildRequires:	libtool >= 2:1.5
+BuildRequires:	pkgconfig
+Requires:	crossmingw32-cairo >= 1.2.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -24,25 +24,46 @@
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
 %define		arch			%{_prefix}/%{target}
-%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
 
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
 %define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
 %description
-C++ wrapper for cairo.
+C++ wrapper for cairo (cross mingw32 version).
 
 %description -l pl.UTF-8
-Interfejs C++ do cairo.
+Interfejs C++ do cairo (wersja skrośna mingw32).
+
+%package static
+Summary:	Static cairomm library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka cairomm (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static cairomm library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka cairomm (wersja skrośna mingw32).
+
+%package dll
+Summary:	DLL cairomm library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL cairomm dla Windows
+Group:		Applications/Emulators
+Requires:	crossmingw32-cairo-dll >= 1.2.2
+
+%description dll
+DLL cairomm library for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteka DLL cairomm dla Windows.
 
 %prep
 %setup -q -n %{_realname}-%{version}
-%patch0 -p1
-#rm -rf examples
 
 %build
 export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
@@ -54,8 +75,6 @@
 	--target=%{target} \
 	--host=%{target} \
 	--disable-docs
-#	--enable-shared \
-#	--enable-static
 
 %{__make}
 
@@ -65,6 +84,14 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
 rm -rf $RPM_BUILD_ROOT%{_docdir}/libcairomm-1.0
 
 %clean
@@ -73,19 +100,29 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
-%{_libdir}/*.la
-%{_libdir}/*.a
-%{_bindir}/*.dll
+%{_libdir}/libcairomm-1.0.dll.a
+%{_libdir}/libcairomm-1.0.la
 %dir %{_includedir}/cairomm-1.0
 %{_includedir}/cairomm-1.0/*
 %{_pkgconfigdir}/cairomm-1.0.pc
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcairomm-1.0.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libcairomm-1.0-*.dll
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/03/06 21:47:26  qboosh
+- cleanup, separated -static,-dll
+
 Revision 1.2  2007/03/05 11:47:26  qboosh
 - rcs tags
 - BR: cross gcc-c++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-cairomm.spec?r1=1.2&r2=1.3&f=u