[packages/catdoc] - updated to 0.95

[qboosh]

commit e4810599cfcb9d248caffa01d42b94b8092ebd13
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 27 16:15:23 2023 +0200

    - updated to 0.95

 catdoc-build.patch | 11 -----------
 catdoc-make.patch  | 11 +++++++++++
 catdoc-opt.patch   | 12 ++++++------
 catdoc.spec        | 23 ++++++++++++++---------
 4 files changed, 31 insertions(+), 26 deletions(-)
---
diff --git a/catdoc.spec b/catdoc.spec
index 75fc6dc..81bc420 100644
--- a/catdoc.spec
+++ b/catdoc.spec
@@ -1,14 +1,14 @@
 Summary:	Reads MS-Word file and puts its content as plain text on standard output
 Summary(pl.UTF-8):	Program konwertujący pliki MS Worda na czysty tekst
 Name:		catdoc
-Version:	0.94.2
-Release:	2
+Version:	0.95
+Release:	1
 License:	GPL v2
 Group:		Applications/Text
 Source0:	http://ftp.wagner.pp.ru/pub/catdoc/%{name}-%{version}.tar.gz
-# Source0-md5:	243e1680bb3e703616f5adecfee24491
+# Source0-md5:	4ece2f43b140fab6a2c3a9d6436d7779
 Patch0:		%{name}-opt.patch
-Patch1:		%{name}-build.patch
+Patch1:		%{name}-make.patch
 URL:		http://www.wagner.pp.ru/~vitus/software/catdoc/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -45,15 +45,20 @@ cp -f /usr/share/automake/config.sub .
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -j1 install \
-	installroot=$RPM_BUILD_ROOT \
-	mandir=%{_mandir}/man1
+	installroot=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CREDITS NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
+%doc NEWS README TODO
+%attr(755,root,root) %{_bindir}/catdoc
+%attr(755,root,root) %{_bindir}/catppt
+%attr(755,root,root) %{_bindir}/wordview
+%attr(755,root,root) %{_bindir}/xls2csv
 %{_datadir}/catdoc
-%{_mandir}/man1/*
+%{_mandir}/man1/catdoc.1*
+%{_mandir}/man1/catppt.1*
+%{_mandir}/man1/wordview.1*
+%{_mandir}/man1/xls2csv.1*
diff --git a/catdoc-build.patch b/catdoc-build.patch
deleted file mode 100644
index c24637d..0000000
--- a/catdoc-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- catdoc-0.94.2/configure.in~	2015-09-04 18:55:39.000000000 +0200
-+++ catdoc-0.94.2/configure.in	2015-09-04 18:56:16.735391951 +0200
-@@ -119,6 +119,7 @@ AC_SUBST(charsetcheck)
- AC_SUBST(installroot)
- AC_SUBST(catdoc_version)
- AC_SUBST(CFLAGS)
--AC_SUBST(WORDS_BIGENDIAN DEFS)
-+AC_SUBST(WORDS_BIGENDIAN)
-+AC_SUBST(DEFS)
- AC_CONFIG_HEADER(src/config.h)
- AC_OUTPUT(doc/Makefile charsets/Makefile src/Makefile Makefile doc/catdoc.1 doc/xls2csv.1 doc/wordview.1 doc/catppt.1)
diff --git a/catdoc-make.patch b/catdoc-make.patch
new file mode 100644
index 0000000..12aee7f
--- /dev/null
+++ b/catdoc-make.patch
@@ -0,0 +1,11 @@
+--- catdoc-0.95/doc/Makefile.in.orig	2016-05-25 06:54:20.000000000 +0200
++++ catdoc-0.95/doc/Makefile.in	2023-06-27 16:08:37.300240230 +0200
+@@ -30,7 +30,7 @@ clean:
+             wordview.txt wordview.ps build
+ install: @installtargets@
+ install-catdoc: catdoc.1 xls2csv.1 catppt.1
+-	../mkinstalldirs $(installroot)$(mandir)
++	../mkinstalldirs $(installroot)$(mandir)/man1
+ 	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
+ 	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
+ 	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
diff --git a/catdoc-opt.patch b/catdoc-opt.patch
index 0888157..0881682 100644
--- a/catdoc-opt.patch
+++ b/catdoc-opt.patch
@@ -1,12 +1,12 @@
---- catdoc-0.94/configure.in.orig	2005-05-01 14:04:09.000000000 +0200
-+++ catdoc-0.94/configure.in	2005-05-04 21:23:02.088990752 +0200
-@@ -100,10 +100,6 @@
+--- catdoc-0.95/configure.in.orig	2023-06-27 05:32:57.234413642 +0200
++++ catdoc-0.95/configure.in	2023-06-27 05:47:37.729643590 +0200
+@@ -98,10 +98,6 @@ AC_C_CONST
  dnl Checks for library functions.
  AC_FUNC_SETVBUF_REVERSED
  
--if test "$GCC" = "yes"; then
--	CFLAGS="-g -O2 -Wall"
--fi
+-#if test "$GCC" = "yes"; then
+-#	CFLAGS="-g -O2 -Wall"
+-#fi
 -
  AC_DEFINE_UNQUOTED([SOURCE_CHARSET],"$sourcecharset",[Character encoding used by default for 8-bit source files])
  AC_DEFINE_UNQUOTED([TARGET_CHARSET],"$targetcharset",[Output character encoding used by default, if impossible to determine encoding from locale])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/catdoc.git/commitdiff/e4810599cfcb9d248caffa01d42b94b8092ebd13