rpms/wv2/F-12 wv2-0.2.2-no-extra-libs.patch, 1.2, 1.3 wv2-0.2.2-no-undefined.patch, 1.2, 1.3 wv2-fixmultilib.patch, 1.2, 1.3 wv2-gcc43.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wv2.spec, 1.18, 1.19 wv2-0.4.0-LIB_SUFFIX.patch, 1.1, NONE wv2-0.4.0-defines.patch, 1.1, NONE wv2-0.4.0-extra_libs.patch, 1.1, NONE wv2-0.4.0-multilib.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Sep 29 19:17:06 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/wv2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6940
Modified Files:
.cvsignore sources wv2.spec
Added Files:
wv2-0.2.2-no-extra-libs.patch wv2-0.2.2-no-undefined.patch
wv2-fixmultilib.patch wv2-gcc43.patch
Removed Files:
wv2-0.4.0-LIB_SUFFIX.patch wv2-0.4.0-defines.patch
wv2-0.4.0-extra_libs.patch wv2-0.4.0-multilib.patch
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-9
- Epoch: 1
- tighten %files
wv2-0.2.2-no-extra-libs.patch:
wv2-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: wv2-0.2.2-no-extra-libs.patch
===================================================================
RCS file: wv2-0.2.2-no-extra-libs.patch
diff -N wv2-0.2.2-no-extra-libs.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wv2-0.2.2-no-extra-libs.patch 29 Sep 2009 19:17:06 -0000 1.3
@@ -0,0 +1,11 @@
+--- wv2-0.2.2/wv2-config.in.extra_libs 2006-02-21 11:36:20.000000000 -0600
++++ wv2-0.2.2/wv2-config.in 2004-05-09 13:23:15.000000000 -0500
+@@ -76,7 +76,7 @@
+ echo $exec_prefix
+ fi
+
+-wv2_libs="-lwv2 @WV_LDFLAGS@"
++wv2_libs="-lwv2"
+
+ if test "$echo_cflags" = "yes"; then
+ includes="@WV_CFLAGS@"
wv2-0.2.2-no-undefined.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: wv2-0.2.2-no-undefined.patch
===================================================================
RCS file: wv2-0.2.2-no-undefined.patch
diff -N wv2-0.2.2-no-undefined.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wv2-0.2.2-no-undefined.patch 29 Sep 2009 19:17:06 -0000 1.3
@@ -0,0 +1,11 @@
+--- wv2-0.2.2/src/Makefile.am.no-undefined 2004-05-09 13:23:16.000000000 -0500
++++ wv2-0.2.2/src/Makefile.am 2006-02-21 12:02:08.000000000 -0600
+@@ -16,7 +16,7 @@
+
+ libwv2_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -export-dynamic
++ -export-dynamic -no-undefined -Wl,--no-undefined
+
+ libwv2_la_SOURCES = olestorage.cpp olestream.cpp \
+ word97_generated.cpp word97_helper.cpp word95_helper.cpp \
wv2-fixmultilib.patch:
wv2-config.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: wv2-fixmultilib.patch
===================================================================
RCS file: wv2-fixmultilib.patch
diff -N wv2-fixmultilib.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wv2-fixmultilib.patch 29 Sep 2009 19:17:06 -0000 1.3
@@ -0,0 +1,17 @@
+--- wv2-config.in.orig 2008-01-04 00:28:42.000000000 +0100
++++ wv2-config.in 2008-01-04 00:30:43.000000000 +0100
+@@ -87,7 +87,6 @@
+ fi
+
+ if test "$echo_libs" = "yes"; then
+- libdirs=-L at libdir@
+ my_wv2_libs=
+ for i in $wv2_libs ; do
+ if test "x$i" != "x-L at libdir@" ; then
+@@ -99,5 +98,5 @@
+ fi
+ done
+
+- echo $libdirs $my_wv2_libs
++ echo $my_wv2_libs
+ fi
wv2-gcc43.patch:
styles.cpp | 1 +
1 file changed, 1 insertion(+)
Index: wv2-gcc43.patch
===================================================================
RCS file: wv2-gcc43.patch
diff -N wv2-gcc43.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wv2-gcc43.patch 29 Sep 2009 19:17:06 -0000 1.3
@@ -0,0 +1,10 @@
+--- src/styles.cpp.orig 2008-02-22 15:40:41.000000000 +0100
++++ src/styles.cpp 2008-02-22 15:41:05.000000000 +0100
+@@ -24,6 +24,7 @@
+
+ #include "wvlog.h"
+ #include <algorithm>
++#include <string.h>
+
+ namespace wvWare
+ {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/.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 29 Sep 2009 19:17:05 -0000 1.5
@@ -1 +1 @@
-wv2-0.4.0.tar.bz2
+wv2-0.2.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/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 29 Sep 2009 19:17:06 -0000 1.5
@@ -1 +1 @@
-e0acd7a551c898aab3fb6afafc606bb4 wv2-0.4.0.tar.bz2
+ea7e3331fbe597185070c0784411a3f7 wv2-0.2.3.tar.bz2
Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-12/wv2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- wv2.spec 11 Sep 2009 16:47:37 -0000 1.18
+++ wv2.spec 29 Sep 2009 19:17:06 -0000 1.19
@@ -1,28 +1,31 @@
+
Name: wv2
-Version: 0.4.0
-Release: 1%{?dist}
+Epoch: 1
+Version: 0.2.3
+Release: 9%{?dist}
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://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
+# see bug #182293
+Patch1: wv2-0.2.2-no-undefined.patch
+# see bug #192291
+Patch2: wv2-0.2.2-no-extra-libs.patch
+# see bug #343451
+Patch3: wv2-fixmultilib.patch
+# fix gcc43 build
+Patch4: wv2-gcc43.patch
+
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
-Patch50: wv2-0.4.0-defines.patch
-Patch51: wv2-0.4.0-LIB_SUFFIX.patch
-
-BuildRequires: cmake
-BuildRequires: libgsf-devel
-BuildRequires: libxml2-devel
-BuildRequires: pkgconfig
-BuildRequires: glib2-devel
-BuildRequires: zlib-devel
+BuildRequires: automake libtool
+BuildRequires: libgsf-devel
+BuildRequires: libxml2-devel
+BuildRequires: glib2-devel
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
%description
wv is a library which allows access to Microsoft® Word files. It can load and
@@ -33,27 +36,25 @@ formats as well: Word 2 docs are convert
%package devel
Summary: Development tools for programs which will use the wv2 library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: libgsf-devel
Requires: glib2-devel
Requires: libxml2-devel
+
%description devel
The wv2-devel package includes the header files necessary for developing.
-
%prep
%setup -q
+%patch1 -p1 -b .no-undefined
%patch2 -p1 -b .extra_libs
-%patch3 -p1 -b .multilib
-%patch50 -p1 -b .defines
-%patch51 -p1 -b .LIB_SUFFIX
-
+%patch3
+./autogen.sh
+%patch4
%build
-
-%cmake .
-
+%configure --disable-warnings --disable-dependency-tracking
make %{?_smp_mflags}
@@ -61,50 +62,33 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
-
-%check
-# checks currently fail on ppc64, appears to be a toolchain prob
-%ifarch ppc64
-make -k test ||:
-%else
-make -k test
-%endif
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
%clean
rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/libwv2.so.3*
-%dir %{_libdir}/wvWare/
+%{_libdir}/libwv2.so.1*
%files devel
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/wv2-config
%{_libdir}/libwv2.so
-%{_libdir}/wvWare/wv2-noconfig.cmake
-%{_libdir}/wvWare/wv2.cmake
%{_includedir}/wv2/
-
%changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
-- wv2-0.4.0
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.2.3-9
+- Epoch: 1
+- tighten %%files
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--- wv2-0.4.0-LIB_SUFFIX.patch DELETED ---
--- wv2-0.4.0-defines.patch DELETED ---
--- wv2-0.4.0-extra_libs.patch DELETED ---
--- wv2-0.4.0-multilib.patch DELETED ---
More information about the scm-commits
mailing list