rpms/wv/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 wv.spec,1.10,1.11

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-4

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 15:30:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-wv-1.0.3.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 15:30:18 -0000	1.3
+++ sources	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wv.spec	15 May 2005 15:30:18 -0000	1.10
+++ wv.spec	28 Oct 2006 08:53:37 -0000	1.11
@@ -1,26 +1,25 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.3
+Version:    1.2.4
 Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
-Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-1.0.3-oledecod.patch
-Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
+#Patch0:     wv-wvtext-tmp.patch
+#Patch1:     wv-1.0.3-oledecod.patch
+#Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
-#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
+BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
-Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9
@@ -28,23 +27,36 @@
 documents into HTML, which can then be read with a browser.
 
 
+%package        devel
+Summary:        MSWord format converter - development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+Wv is a program that understands the Microsoft Word 6/7/8/9
+binary file format and is able to convert Word
+documents into HTML, which can then be read with a browser.
+This package contains the development files
+
+
 %prep
 %setup -q
 #%patch0
-%patch1 -p1 -b .oledecod
-%patch2 -p1 -b .gcc4
+#%patch1 -p1 -b .oledecod
+#%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
 %build
 %configure --with-exporter \
-           --with-libxml2
+           --with-libxml2 \
+           --disable-static
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
@@ -62,13 +74,41 @@
 %doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
-%{_includedir}/wv
 %{_mandir}/man1/*
-%{_libdir}/libwv*
+%{_libdir}/libwv*.so.*
+
+%files      devel
+%defattr(-,root,root)
+%{_includedir}/wv
+%{_libdir}/libwv*.so
 %{_libdir}/pkgconfig/*
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
+- rebuild (releases 1 to 7, cvs problem)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
+- version 1.2.1
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
+- rebuild
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
+- don't build the static lib
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
+- rebuild for FC5
+
+* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
+- version 1.2.0
+
+* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
+- split out a -devel package (#171962)
+
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
 - new version
 - fix build with gcc4