[packages/wv] - updated to 1.2.9 from abisource (note: new soname) - removed obsolete pc patch
qboosh
qboosh at pld-linux.org
Thu Apr 25 06:00:37 CEST 2019
commit e23610b802001aae78eafccdf80e06b833e4e34f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 25 06:00:53 2019 +0200
- updated to 1.2.9 from abisource (note: new soname)
- removed obsolete pc patch
wv-pc.patch | 13 -------------
wv.spec | 28 ++++++++++++++--------------
2 files changed, 14 insertions(+), 27 deletions(-)
---
diff --git a/wv.spec b/wv.spec
index de25e5c..29eda48 100644
--- a/wv.spec
+++ b/wv.spec
@@ -6,14 +6,13 @@ Summary: MSWord Document to HTML converter
Summary(pl.UTF-8): Konwerter dokumentów MS Worda do HTML
Summary(pt_BR.UTF-8): Conversor de arquivos formato Word (6/7/8/9) para html
Name: wv
-Version: 1.2.4
-Release: 15
-License: GPL
+Version: 1.2.9
+Release: 1
+License: GPL v2+
Group: Applications/Text
-Source0: http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
-# Source0-md5: c1861c560491f121e12917fa76970ac5
-Patch0: %{name}-pc.patch
-Patch1: %{name}-format.patch
+Source0: http://www.abisource.com/downloads/wv/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: dbccf2e9f747e50c913b7e3d126b73f7
+Patch0: %{name}-format.patch
URL: http://wvware.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -89,7 +88,6 @@ Pakiet zawiera statyczne biblioteki wv.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -98,10 +96,10 @@ Pakiet zawiera statyczne biblioteki wv.
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_static_libs:--disable-static} \
--with-zlib \
--with-png \
- --with-libwmf \
- --%{!?with_static_libs:dis}%{?with_static_libs:en}able-static
+ --with-libwmf
%{__make}
@@ -111,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwv.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -136,8 +137,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/wvVersion
%attr(755,root,root) %{_bindir}/wvWare
%attr(755,root,root) %{_bindir}/wvWml
-%attr(755,root,root) %{_libdir}/libwv-*.so.*.*.*
-%ghost %{_libdir}/libwv-*.so.3
+%attr(755,root,root) %{_libdir}/libwv-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwv-1.2.so.4
%{_datadir}/wv
%{_mandir}/man1/wvAbw.1*
%{_mandir}/man1/wvCleanLatex.1*
@@ -157,9 +158,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwv.so
-%{_libdir}/libwv.la
%{_includedir}/wv
-%{_pkgconfigdir}/wv-*.pc
+%{_pkgconfigdir}/wv-1.0.pc
%if %{with static_libs}
%files static
diff --git a/wv-pc.patch b/wv-pc.patch
deleted file mode 100644
index e770c19..0000000
--- a/wv-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- wv-1.2.4/wv-1.0.pc.in~ 2005-04-18 23:14:48.000000000 +0200
-+++ wv-1.2.4/wv-1.0.pc.in 2010-02-07 20:10:33.553971551 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-
- Name: wvWare
- Description: Word Document Filter library and utilities
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wv.git/commitdiff/e23610b802001aae78eafccdf80e06b833e4e34f
More information about the pld-cvs-commit
mailing list