commit indent for openSUSE:Factory
Hello community, here is the log from the commit of package indent for openSUSE:Factory checked in at 2015-02-27 10:59:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/indent (Old) and /work/SRC/openSUSE:Factory/.indent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "indent" Changes: -------- --- /work/SRC/openSUSE:Factory/indent/indent.changes 2015-02-20 12:01:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.indent.new/indent.changes 2015-02-27 10:59:10.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 19 09:28:11 UTC 2015 - dimstar@opensuse.org + +- Replace texinfo BuildRequires with makeinfo and texi2html: only + those parts are needed. +- Add indent-texi2html-5.0.patch: Fix build with texi2html 5.0 + (note: patches Makeinfo.in in order to not depend on libtool) +- Move install_info_delete from postun to preun. + +------------------------------------------------------------------- New: ---- indent-texi2html-5.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ indent.spec ++++++ --- /var/tmp/diff_new_pack.8Fdo6s/_old 2015-02-27 10:59:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8Fdo6s/_new 2015-02-27 10:59:11.000000000 +0100 @@ -31,7 +31,9 @@ Patch2: %{name}-%{version}-lcall.diff Patch3: %{name}-%{version}-cdw.diff Patch4: %{name}-%{version}-man.diff -BuildRequires: texinfo +Patch5: indent-texi2html-5.0.patch +BuildRequires: makeinfo +BuildRequires: texi2html Requires(pre): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,6 +50,7 @@ %patch2 %patch3 -p1 %patch4 +%patch5 -p1 %build %configure @@ -67,14 +70,14 @@ %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun +%preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files -f %{name}.lang %defattr(-, root, root) %{_bindir}/* %doc doc/indent.html -%{_infodir}/indent.info*.gz +%{_infodir}/%{name}.info.gz %{_mandir}/man1/indent.1.gz %changelog ++++++ indent-texi2html-5.0.patch ++++++ Index: indent-2.2.10/doc/Makefile.am =================================================================== --- indent-2.2.10.orig/doc/Makefile.am +++ indent-2.2.10/doc/Makefile.am @@ -34,14 +34,14 @@ html-monolithic: @PACKAGE@.html html-split: @PACKAGE@_toc.html @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS) - $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` + $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS) case "$(TEXI2HTML)" in \ *"/missing texi2html") \ - $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \ + $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \ *) $(RM) @PACKAGE@_*.html ; \ - $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \ + $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \ esac install-html-monolithic: @PACKAGE@.html Index: indent-2.2.10/doc/Makefile.in =================================================================== --- indent-2.2.10.orig/doc/Makefile.in +++ indent-2.2.10/doc/Makefile.in @@ -616,14 +616,14 @@ html-monolithic: @PACKAGE@.html html-split: @PACKAGE@_toc.html @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS) - $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` + $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS) case "$(TEXI2HTML)" in \ *"/missing texi2html") \ - $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \ + $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \ *) $(RM) @PACKAGE@_*.html ; \ - $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \ + $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \ esac install-html-monolithic: @PACKAGE@.html -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de