rpms/wv2/devel wv2-0.2.2-no-extra-libs.patch, NONE, 1.1 wv2-0.2.2-no-undefined.patch, NONE, 1.1 wv2.spec, 1.4, 1.5

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/wv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22071

Modified Files:
	wv2.spec 
Added Files:
	wv2-0.2.2-no-extra-libs.patch wv2-0.2.2-no-undefined.patch 
Log Message:
- Fix #18229{1,3}
- Tune configure


wv2-0.2.2-no-extra-libs.patch:

--- NEW FILE wv2-0.2.2-no-extra-libs.patch ---
--- 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:

--- NEW FILE wv2-0.2.2-no-undefined.patch ---
--- 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 \


Index: wv2.spec
===================================================================
RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wv2.spec	16 Feb 2006 23:14:18 -0000	1.4
+++ wv2.spec	21 Feb 2006 21:40:32 -0000	1.5
@@ -1,14 +1,20 @@
 Name:           wv2
 Version:        0.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A library which allows access to Microsoft® Word files
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wvware.sourceforge.net
 Source0:        http://dl.sf.net/wvware/wv2-0.2.2.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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  automake
 BuildRequires:  libgsf-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
@@ -35,9 +41,13 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .no-undefined
+%patch2 -p1 -b .extra_libs
+
+./autogen.sh
 
 %build
-%configure
+%configure --disable-warnings --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -67,6 +77,10 @@
 %{_includedir}/wv2
 
 %changelog
+* Tue Feb 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-8
+- Fix #19229{1,3}
+- Tune configure
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-7
 - Rebuild for Fedora Extras 5