rpms/wv2/devel wv2-0.4.0-LIB_SUFFIX.patch, NONE, 1.1 wv2-0.4.0-defines.patch, NONE, 1.1 wv2-0.4.0-extra_libs.patch, NONE, 1.1 wv2-0.4.0-multilib.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wv2.spec, 1.16, 1.17 wv2-0.2.2-no-extra-libs.patch, 1.1, NONE wv2-0.2.2-no-undefined.patch, 1.1, NONE wv2-fixmultilib.patch, 1.1, NONE wv2-gcc43.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Sep 11 15:56:41 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24302
Modified Files:
.cvsignore sources wv2.spec
Added 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
Removed Files:
wv2-0.2.2-no-extra-libs.patch wv2-0.2.2-no-undefined.patch
wv2-fixmultilib.patch wv2-gcc43.patch
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
- wv2-0.4.0
wv2-0.4.0-LIB_SUFFIX.patch:
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE wv2-0.4.0-LIB_SUFFIX.patch ---
diff -up wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX wv2-0.4.0/src/CMakeLists.txt
--- wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX 2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/src/CMakeLists.txt 2009-09-11 09:26:27.942622901 -0500
@@ -90,11 +90,11 @@ ENDIF( WIN32 )
INSTALL( TARGETS wv2
EXPORT wvWare
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}/static
)
-INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake )
+INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake )
INSTALL( FILES ${wv2_HEADERS}
DESTINATION include/wv2
@@ -103,5 +103,5 @@ INSTALL( FILES ${wv2_HEADERS}
# libtool files are useless for Visual C++ and Borland C++
IF( NOT MSVC AND NOT BORLAND )
INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
- CREATE_LIBTOOL_FILE( wv2 /lib )
+ CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
ENDIF( NOT MSVC AND NOT BORLAND )
wv2-0.4.0-defines.patch:
ustring.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE wv2-0.4.0-defines.patch ---
diff -up wv2-0.4.0/src/ustring.cpp.defines wv2-0.4.0/src/ustring.cpp
--- wv2-0.4.0/src/ustring.cpp.defines 2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/src/ustring.cpp 2009-09-11 09:18:40.596622813 -0500
@@ -78,9 +78,9 @@ bool wvWare::isPosInf(double d)
{
#if defined(HAVE_FUNC_ISINF)
return (isinf(d) == 1);
-#elif HAVE_FUNC_FINITE
+#elif defined(HAVE_FUNC_FINITE)
return finite(d) == 0 && d == d; // ### can we distinguish between + and - ?
-#elif HAVE_FUNC__FINITE
+#elif defined(HAVE_FUNC__FINITE)
return _finite(d) == 0 && d == d; // ###
#else
return false;
@@ -91,9 +91,9 @@ bool wvWare::isNegInf(double d)
{
#if defined(HAVE_FUNC_ISINF)
return (isinf(d) == -1);
-#elif HAVE_FUNC_FINITE
+#elif defined(HAVE_FUNC_FINITE)
return finite(d) == 0 && d == d; // ###
-#elif HAVE_FUNC__FINITE
+#elif defined(HAVE_FUNC__FINITE)
return _finite(d) == 0 && d == d; // ###
#else
return false;
wv2-0.4.0-extra_libs.patch:
wv2-config.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE wv2-0.4.0-extra_libs.patch ---
diff -up wv2-0.4.0/wv2-config.cmake.extra_libs wv2-0.4.0/wv2-config.cmake
--- wv2-0.4.0/wv2-config.cmake.extra_libs 2009-08-26 16:46:40.000000000 -0500
+++ wv2-0.4.0/wv2-config.cmake 2009-09-11 09:36:48.155394840 -0500
@@ -76,7 +76,7 @@ if test "$echo_exec_prefix" = "yes"; the
echo $exec_prefix
fi
-wv2_libs="@WV2_LDFLAGS@ -lwv2 @WV2_LIBS@"
+wv2_libs="-lwv2"
if test "$echo_cflags" = "yes"; then
includes="@WV2_CFLAGS@"
wv2-0.4.0-multilib.patch:
wv2-config.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE wv2-0.4.0-multilib.patch ---
diff -up wv2-0.4.0/wv2-config.cmake.multilib wv2-0.4.0/wv2-config.cmake
--- wv2-0.4.0/wv2-config.cmake.multilib 2009-09-11 09:38:24.415620835 -0500
+++ wv2-0.4.0/wv2-config.cmake 2009-09-11 09:43:19.806622445 -0500
@@ -87,7 +87,6 @@ if test "$echo_cflags" = "yes"; then
fi
if test "$echo_libs" = "yes"; then
- libdirs=-L${exec_prefix}/lib
my_wv2_libs=
for i in $wv2_libs ; do
if test "x$i" != "x-L${exec_prefix}/lib" ; then
@@ -99,5 +98,5 @@ if test "$echo_libs" = "yes"; then
fi
done
- echo $libdirs $my_wv2_libs
+ echo $my_wv2_libs
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 18 Jun 2006 08:30:45 -0000 1.3
+++ .cvsignore 11 Sep 2009 15:56:41 -0000 1.4
@@ -1 +1 @@
-wv2-0.2.3.tar.bz2
+wv2-0.4.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 18 Jun 2006 08:30:45 -0000 1.3
+++ sources 11 Sep 2009 15:56:41 -0000 1.4
@@ -1 +1 @@
-ea7e3331fbe597185070c0784411a3f7 wv2-0.2.3.tar.bz2
+e0acd7a551c898aab3fb6afafc606bb4 wv2-0.4.0.tar.bz2
Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- wv2.spec 27 Jul 2009 07:29:59 -0000 1.16
+++ wv2.spec 11 Sep 2009 15:56:41 -0000 1.17
@@ -1,30 +1,28 @@
Name: wv2
-Version: 0.2.3
-Release: 9%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Summary: A library which allows access to Microsoft® Word files
Group: System Environment/Libraries
License: LGPLv2
URL: http://wvware.sourceforge.net
-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
-
+Source0: http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
-BuildRequires: libgsf-devel
-BuildRequires: libxml2-devel
-BuildRequires: glib2-devel
-BuildRequires: zlib-devel
-BuildRequires: pkgconfig
-BuildRequires: libtool
+# 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
%description
wv is a library which allows access to Microsoft® Word files. It can load and
@@ -39,21 +37,22 @@ Requires: %{name} = %{version}-%{r
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
-./autogen.sh
-%patch4
+%patch3 -p1 -b .multilib
+%patch50 -p1 -b .defines
+%patch51 -p1 -b .LIB_SUFFIX
+
%build
-%configure --disable-warnings --disable-dependency-tracking
+%cmake .
+
make %{?_smp_mflags}
@@ -61,30 +60,43 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+
+%check
+make test %{?_smp_mflags}
-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}/*.so.*
+%{_libdir}/libwv2.so.3*
+%dir %{_libdir}/wvWare/
%files devel
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/wv2-config
-%{_libdir}/*.so
-%{_includedir}/wv2
+%{_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
--- wv2-0.2.2-no-extra-libs.patch DELETED ---
--- wv2-0.2.2-no-undefined.patch DELETED ---
--- wv2-fixmultilib.patch DELETED ---
--- wv2-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list