packages: wv2/wv2.spec - 0.4.1 - changed to cmake build - no more -static s...

[shadzik]

Author: shadzik                      Date: Tue Dec  1 00:27:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.4.1
- changed to cmake build
- no more -static subpackage

---- Files affected:
packages/wv2:
   wv2.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/wv2/wv2.spec
diff -u packages/wv2/wv2.spec:1.26 packages/wv2/wv2.spec:1.27
--- packages/wv2/wv2.spec:1.26	Sat May 16 18:19:08 2009
+++ packages/wv2/wv2.spec	Tue Dec  1 01:26:58 2009
@@ -5,19 +5,15 @@
 Summary:	MS Word Document reading library
 Summary(pl.UTF-8):	Biblioteka czytająca dokumenty MS Worda
 Name:		wv2
-Version:	0.3.1
+Version:	0.4.1
 Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.bz2
-# Source0-md5:	4a20200141cb1299055f2bf13b56989d
+# Source0-md5:	7565fcc392c8869c44a301992b3ea561
 URL:		http://wvware.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	cmake >= 2.6.1-2
 BuildRequires:	libgsf-devel >= 1.7.2
-BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.4d-3
-BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +30,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libgsf-devel
-Requires:	libstdc++-devel
+Obsoletes:	wv2-static
 
 %description devel
 Contains the wv2 header files.
@@ -42,19 +38,6 @@
 %description devel -l pl.UTF-8
 Pakiet tem zawiera pliki nagłówkowe wv2.
 
-%package static
-Summary:	Static wv2 library
-Summary(pl.UTF-8):	Biblioteka statyczna wv2
-Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com o wv
-Group:		Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Contains static wv2 library.
-
-%description static -l pl.UTF-8
-Pakiet zawiera statyczną bibliotekę wv2.
-
 %prep
 %setup -q
 
@@ -62,22 +45,21 @@
 rm -rf autom4te.cache
 
 %build
-# supplied libtool doesn't have C++ support
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	%{?debug:--enable-debug} \
-	--enable-static
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64
+%endif
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -89,19 +71,17 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog THANKS TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libwv2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwv2.so.?
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/escher/*.html doc/DESIGN.html src/generator/{*.htm,spec_defects}
 %attr(755,root,root) %{_bindir}/wv2-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libwv2.so
+%{_libdir}/libwv2.la
 %{_includedir}/wv2
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/wvWare
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -109,6 +89,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2009/12/01 00:26:58  shadzik
+- 0.4.1
+- changed to cmake build
+- no more -static subpackage
+
 Revision 1.26  2009/05/16 16:19:08  hawk
 - updated to 0.3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wv2/wv2.spec?r1=1.26&r2=1.27&f=u