pool/indent
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 287593 from home:dimstar:Factory

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/287593
OBS-URL: https://build.opensuse.org/package/show/devel:tools/indent?expand=0&rev=7
This commit is contained in:
Martin Pluskal 2015-02-24 19:54:29 +00:00 committed by Git OBS Bridge
parent 9b7c52fcbe
commit 2704117eaf
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
indent-texi2html-5.0.patch Normal file
View File

@ -0,0 +1,44 @@
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

9
indent.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Wed Feb 18 20:44:18 UTC 2015 - mpluskal@suse.com

9
indent.spec
View File

@ -31,7 +31,9 @@ Patch1: %{name}-%{version}-warnings.diff
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 @@ incomplete and malformed syntax.
%patch2
%patch3 -p1
%patch4
%patch5 -p1
%build
%configure
@ -67,14 +70,14 @@ make %{?_smp_mflags} -C regression
%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