rpms/wv2/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wv2.spec, 1.19, 1.20 wv2-0.4.0-defines.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv444

Modified Files:
	.cvsignore sources wv2.spec 
Removed Files:
	wv2-0.4.0-defines.patch 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-1
- wv2-0.4.1 (ABI bump)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Sep 2009 15:56:41 -0000	1.4
+++ .cvsignore	9 Oct 2009 15:24:40 -0000	1.5
@@ -1 +1 @@
-wv2-0.4.0.tar.bz2
+wv2-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Sep 2009 15:56:41 -0000	1.4
+++ sources	9 Oct 2009 15:24:41 -0000	1.5
@@ -1 +1 @@
-e0acd7a551c898aab3fb6afafc606bb4  wv2-0.4.0.tar.bz2
+7565fcc392c8869c44a301992b3ea561  wv2-0.4.1.tar.bz2


Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- wv2.spec	8 Oct 2009 14:49:03 -0000	1.19
+++ wv2.spec	9 Oct 2009 15:24:41 -0000	1.20
@@ -1,23 +1,19 @@
+
 Name:           wv2
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
-Summary:        A library which allows access to Microsoft® Word files
+Summary:        A library which allows access to Microsoft Word files
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://wvware.sourceforge.net
-Source0:        http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/wvware/wv2-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see bug #192291
 Patch2: wv2-0.4.0-extra_libs.patch
 # see bug #343451
 Patch3: wv2-0.4.0-multilib.patch
-## upstreamable patches
-# http://bugzilla.abisource.com/show_bug.cgi?id=12422
-Patch50: wv2-0.4.0-defines.patch
-# http://bugzilla.abisource.com/show_bug.cgi?id=12421
-Patch51: wv2-0.4.0-LIB_SUFFIX.patch
 
 BuildRequires: cmake
 BuildRequires: libgsf-devel
@@ -27,7 +23,7 @@ BuildRequires: glib2-devel
 BuildRequires: zlib-devel
 
 %description
-wv is a library which allows access to Microsoft® Word files. It can load and
+wv is a library which allows access to Microsoft Word files. It can load and
 parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known
 internally as Word 9, 8, 7 and 6.) There is some support for reading earlier
 formats as well: Word 2 docs are converted to plaintext. 
@@ -48,36 +44,38 @@ The wv2-devel package includes the heade
 
 %patch2 -p1 -b .extra_libs
 %patch3 -p1 -b .multilib
-%patch50 -p1 -b .defines
-%patch51 -p1 -b .LIB_SUFFIX
 
 
 %build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
 
-%cmake .
-
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %check
+pushd %{_target_platform}
 # checks currently fail on ppc64, appears to be a toolchain prob
 %ifarch ppc64
-make -k test ||: 
+make -k test -C ||:
 %else
 make -k test
 %endif
+popd
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -88,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/libwv2.so.3*
+%{_libdir}/libwv2.so.4*
 %dir %{_libdir}/wvWare/
 
 %files devel
@@ -102,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-1
+- wv2-0.4.1 (ABI bump)
+
 * Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
 - wv2-0.4.0
 


--- wv2-0.4.0-defines.patch DELETED ---