Hello community, here is the log from the commit of package catdoc for openSUSE:Factory checked in at 2015-10-30 16:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/catdoc (Old) and /work/SRC/openSUSE:Factory/.catdoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "catdoc" Changes: -------- --- /work/SRC/openSUSE:Factory/catdoc/catdoc.changes 2013-12-02 14:59:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.catdoc.new/catdoc.changes 2015-10-30 16:35:13.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 27 09:22:50 UTC 2015 - [email protected] + +- Respect cflags: + * catdoc-cflags.patch +- Do not install TODO solves issue with wrong line encoding + +------------------------------------------------------------------- New: ---- catdoc-cflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ catdoc.spec ++++++ --- /var/tmp/diff_new_pack.M5YjxT/_old 2015-10-30 16:35:14.000000000 +0100 +++ /var/tmp/diff_new_pack.M5YjxT/_new 2015-10-30 16:35:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package catdoc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,11 +28,13 @@ 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 +# PATCH-FIX-UPSTREAM catdoc-cflags.patch -- respect cflags +Patch2: catdoc-cflags.patch BuildRequires: freetype2-devel BuildRequires: tcl BuildRequires: tk BuildRequires: update-desktop-files +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Catdoc is a MS Word file decoding tool that doesn't attempt to @@ -45,27 +47,26 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -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/ +mkdir -p %{buildroot}%{_mandir}/man1 +mv $RPM_BUILD_DIR/%{name}-%{version}/doc/*.1 %{buildroot}%{_mandir}/man1/ %suse_update_desktop_file wordview Office WordProcessor GNOME %files %defattr(-, root, root, 0755) -%doc COPYING CREDITS NEWS README TODO -%doc %{_mandir}/man1/* +%doc COPYING CREDITS NEWS README +%{_mandir}/man1/* # Conflicts with xls2csv package -%exclude %doc %{_mandir}/man1/xls2csv* +%exclude %{_mandir}/man1/xls2csv* %{_bindir}/catdoc %{_bindir}/catppt %{_bindir}/wordview ++++++ catdoc-cflags.patch ++++++ Index: catdoc-0.94.4/src/Makefile.in =================================================================== --- catdoc-0.94.4.orig/src/Makefile.in +++ catdoc-0.94.4/src/Makefile.in @@ -72,10 +72,10 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ) # $(CC) -c $(CFLAGS) $* all: @buildtargets@ catdoc: $(OBJ) - $(CC) -o catdoc $(OBJ) + $(CC) $(CFLAGS) -o catdoc $(OBJ) catppt: $(OBJPPT) - $(CC) -o catppt $(OBJPPT) -lm + $(CC) $(CFLAGS) -o catppt $(OBJPPT) -lm install: @installtargets@ install-catdoc:catdoc catppt Index: catdoc-0.94.4/configure =================================================================== --- catdoc-0.94.4.orig/configure +++ catdoc-0.94.4/configure @@ -1499,10 +1499,6 @@ EOF fi -if test "$GCC" = "yes"; then - CFLAGS="-g -O2 -Wall" -fi - cat >> confdefs.h <<EOF #define SOURCE_CHARSET "$sourcecharset" EOF Index: catdoc-0.94.4/configure.in =================================================================== --- catdoc-0.94.4.orig/configure.in +++ catdoc-0.94.4/configure.in @@ -100,10 +100,6 @@ AC_C_CONST dnl Checks for library functions. AC_FUNC_SETVBUF_REVERSED -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]) AC_DEFINE_UNQUOTED([SPEC_EXT],"$specsuffix",[Suffix for files with special symbols map (ones to be replaced regardless of availability in target encoding)])
