Hello community,
here is the log from the commit of package catdoc for openSUSE:Factory checked in at 2013-12-02 14:59:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/catdoc (Old)
and /work/SRC/openSUSE:Factory/.catdoc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "catdoc"
Changes:
--------
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++ /work/SRC/openSUSE:Factory/.catdoc.new/catdoc.changes 2013-12-02 14:59:47.000000000 +0100
@@ -0,0 +1,40 @@
+-------------------------------------------------------------------
+Sun Nov 17 17:22:32 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added dont_build_xls2csv.patch: xls2csv is provided by two other
+ packages, so we don't need it built
+- Added install.patch, for honoring installroot variable
+
+-------------------------------------------------------------------
+Tue Oct 15 16:11:37 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to 0.94.4
+- Changes since 0.94.3:
+ * Remove extra ';' in src/xlsparse.c which turned for loop in
+ xlsparse into a buffer overflow
+- Changes since 0.94.2:
+ * Fix codepage bugs
+ * Fix charset bug
+ * Handle negative numbers on 64bit architectures
+ * Fix Macintosh MS1904 date bug in xlsparse reported ubuntu
+
+-------------------------------------------------------------------
+* Mon Mar 16 2009 Raymond Wooninck - 0.94.2
+- Moved package to KDE:KDE4:Community to support Recoll
+
+-------------------------------------------------------------------
+* Wed Aug 01 2007 John Pye 0.94.2-2
+- Fixing 'makeinstall' macro for SUSE.
+- Fixing install of man page(s).
+
+-------------------------------------------------------------------
+* Sun Apr 23 2006 Dries Verachtert - 0.94.2-1
+- Updated to release 0.94.2.
+
+-------------------------------------------------------------------
+* Sat Apr 08 2006 Dries Verachtert - 0.94-1.2
+- Rebuild for Fedora Core 5.
+
+-------------------------------------------------------------------
+* Sat Dec 10 2005 Dries Verachtert - 0.94-1
+- Initial package.
New:
----
catdoc.changes
catdoc.spec
catdoc_0.94.4.orig.tar.gz
dont_build_xls2csv.patch
install.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ catdoc.spec ++++++
#
# spec file for package catdoc
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: catdoc
Version: 0.94.4
Release: 0
Summary: Decodes MS Word files into plain text or TeX format
License: GPL-2.0+
Group: Productivity/Publishing/Other
Url: http://www.45.free.net/~vitus/software/catdoc/
Source: http://cdn.debian.net/debian/pool/main/c/catdoc/%{name}_%{version}.orig.tar.gz
# PATCH-FIX-UPSTREAM install.patch -- honor installroot var
Patch0: install.patch
# PATCH-FIX-OPENSUSE dont_build_xls2csv.patch -- xls2csv is provided by two other packages, so we don't need it built
Patch1: dont_build_xls2csv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: freetype2-devel
BuildRequires: tcl
BuildRequires: tk
BuildRequires: update-desktop-files
%description
Catdoc is a MS Word file decoding tool that doesn't attempt to
analyze file formatting (it just extracts readable text), but
is able to handle all versions of Word and convert character
encodings. A Tcl/Tk graphical viewer is also included. It can
also read RTF files and convert Excel and PowerPoint files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS"
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
%configure
make %{?_smp_mflags}
%install
make installroot=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/man
mkdir -p %{buildroot}%{_datadir}/man/man1
mv $RPM_BUILD_DIR/%{name}-%{version}/doc/*.1 %{buildroot}%{_datadir}/man/man1/
%suse_update_desktop_file wordview Office WordProcessor GNOME
%files
%defattr(-, root, root, 0755)
%doc COPYING CREDITS NEWS README TODO
%doc %{_mandir}/man1/*
# Conflicts with xls2csv package
%exclude %doc %{_mandir}/man1/xls2csv*
%{_bindir}/catdoc
%{_bindir}/catppt
%{_bindir}/wordview
%dir %{_datadir}/catdoc
%{_datadir}/catdoc/*.txt
%{_datadir}/catdoc/*.*chars
%{_datadir}/applications/wordview.desktop
%{_datadir}/pixmaps/wordview.xpm
%changelog
++++++ dont_build_xls2csv.patch ++++++
diff -Naur catdoc-0.94.4.orig/doc/Makefile.in catdoc-0.94.4/doc/Makefile.in
--- catdoc-0.94.4.orig/doc/Makefile.in 2012-12-03 18:59:19.000000000 +0100
+++ catdoc-0.94.4/doc/Makefile.in 2013-11-11 20:36:45.394251337 +0100
@@ -20,19 +20,18 @@
all:
touch build
-dosdoc: catdoc.txt catdoc.ps xls2csv.txt xls2csv.ps catppt.txt catppt.ps
+dosdoc: catdoc.txt catdoc.ps catppt.txt catppt.ps
clean:
rm build
#install: @installtargets@
-#install-catdoc: catdoc.1 xls2csv.1 catppt.1
+#install-catdoc: catdoc.1 catppt.1
# ../mkinstalldirs $(installroot)$(mandir)
# $(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/catdoc$(manext)
-# $(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/xls2csv$(manext)
# $(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/catppt$(manext)
#install-wordview:
# ../mkinstalldirs $(installroot)$(mandir)
# $(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/wordview$(manext)
# Following rules are primarily for developers use. I doubt that you
# need to rebuild these versions of documentation
-distclean: catppt.txt catppt.ps catdoc.1 catdoc.txt catdoc.ps xls2csv.1 xls2csv.txt xls2csv.ps
+distclean: catppt.txt catppt.ps catdoc.1 catdoc.txt catdoc.ps
rm Makefile
diff -Naur catdoc-0.94.4.orig/src/Makefile.in catdoc-0.94.4/src/Makefile.in
--- catdoc-0.94.4.orig/src/Makefile.in 2012-12-03 18:59:19.000000000 +0100
+++ catdoc-0.94.4/src/Makefile.in 2013-11-11 20:35:26.189241536 +0100
@@ -67,25 +67,20 @@
OBJ=catdoc.o reader.o writer.o analyze.o rtfread.o $(COMMONOBJ)
-OBJXLS=xls2csv.o sheet.o xlsparse.o $(COMMONOBJ)
-
OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
#.c.o:
# $(CC) -c $(CFLAGS) $*
all: @buildtargets@
catdoc: $(OBJ)
$(CC) -o catdoc $(OBJ)
-xls2csv: $(OBJXLS)
- $(CC) -o xls2csv $(OBJXLS) -lm
catppt: $(OBJPPT)
$(CC) -o catppt $(OBJPPT) -lm
install: @installtargets@
-install-catdoc:catdoc xls2csv catppt
+install-catdoc:catdoc catppt
../mkinstalldirs $(installroot)$(bindir)
$(INSTALL) -m 755 catdoc $(installroot)$(bindir)/catdoc
- $(INSTALL) -m 755 xls2csv $(installroot)$(bindir)/xls2csv
$(INSTALL) -m 755 catppt $(installroot)$(bindir)/catppt
install-wordview: wordview
../mkinstalldirs $(installroot)$(bindir)
@@ -98,6 +93,6 @@
strftime.o: ../compat/strftime.c
$(CC) -c $(FLAGS) -o $@ $*
clean:
- rm -f *.o catdoc wordview xls2csv catppt
+ rm -f *.o catdoc wordview catppt
distclean: clean
rm Makefile
diff -Naur catdoc-0.94.4.orig/src/makefile.tc catdoc-0.94.4/src/makefile.tc
--- catdoc-0.94.4.orig/src/makefile.tc 2012-12-03 18:59:19.000000000 +0100
+++ catdoc-0.94.4/src/makefile.tc 2013-11-11 20:35:50.929932234 +0100
@@ -8,8 +8,6 @@
all: catdoc.exe xls2csv.exe catppt.exe
catdoc.exe: catdoc.obj catdoc.lib
$(CC) -v -mc catdoc.obj catdoc.lib
-xls2csv.exe: xls2csv.obj catdoc.lib
- $(CC) -v -mc xls2csv.obj catdoc.lib
catppt.exe: catppt.obj catdoc.lib
$(CC) -v -mc catppt.obj catdoc.lib
langinfo.obj: ..\compat\langinfo.c
++++++ install.patch ++++++
diff -Naur catdoc-0.94.4.orig/desktop/Makefile.in catdoc-0.94.4/desktop/Makefile.in
--- catdoc-0.94.4.orig/desktop/Makefile.in 2012-12-03 18:59:19.000000000 +0100
+++ catdoc-0.94.4/desktop/Makefile.in 2013-10-15 18:33:37.693786628 +0200
@@ -20,10 +20,10 @@
clean:
install: all
- ../mkinstalldirs $(prefix)$(desktopdir)
- ../mkinstalldirs $(prefix)$(iconsdir)
- $(INSTALL) -m 644 wordview.desktop $(prefix)$(desktopdir)/wordview.desktop
- $(INSTALL) -m 644 wordview.xpm $(prefix)$(iconsdir)/wordview.xpm
+ ../mkinstalldirs $(installroot)$(prefix)$(desktopdir)
+ ../mkinstalldirs $(installroot)$(prefix)$(iconsdir)
+ $(INSTALL) -m 644 wordview.desktop $(installroot)$(prefix)$(desktopdir)/wordview.desktop
+ $(INSTALL) -m 644 wordview.xpm $(installroot)$(prefix)$(iconsdir)/wordview.xpm
distclean: clean
rm Makefile
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
