Attachment 291429 Details for Bug 226488 – fixes for the spec file

[patch] fixes for the spec file

texinfo.spec.diff (text/plain), 3.05 KB, created by Patrice Dumas on 2008-01-11 22:44:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-01-11 22:44:40 UTC

Size: 3.05 KB

patch

obsolete

>? .build-4.11-4.fc9.log
>? i386
>? texinfo-4.11
>? texinfo-4.11-4.fc9.src.rpm
>Index: texinfo.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/texinfo/devel/texinfo.spec,v
>retrieving revision 1.49
>diff -u -3 -p -r1.49 texinfo.spec
>--- texinfo.spec	10 Dec 2007 14:56:42 -0000	1.49
>+++ texinfo.spec	11 Jan 2008 22:44:00 -0000
>@@ -2,7 +2,7 @@ Summary: Tools needed to create Texinfo 
> Name: texinfo
> Version: 4.11
> Release: 4%{?dist}
>-License: GPLv3
>+License: GPLv3+
> Group: Applications/Publishing
> Url: http://www.gnu.org/software/texinfo/
> Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
>@@ -16,10 +16,6 @@ Requires(preun): /sbin/install-info
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires: zlib-devel, ncurses-devel
> 
>-# Redefine this so "dir" in the info directory isn't compressed
>-
>-%define __spec_install_post %{?__debug_package:%{__debug_install_post}} /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f
>-
> %description
> Texinfo is a documentation system that can produce both online
> information and printed output from a single source file. The GNU
>@@ -73,15 +69,11 @@ make %{?_smp_mflags}
> rm -rf ${RPM_BUILD_ROOT}
> mkdir -p ${RPM_BUILD_ROOT}/sbin
> 
>-make install DESTDIR=$RPM_BUILD_ROOT
>+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
> 
>-pushd ${RPM_BUILD_ROOT}
>-  install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1
>-  gzip -n -9f .%{_infodir}/*info*
>-  gzip -n -9f .%{_mandir}/*/*
>-  install -m644 %{SOURCE1} .%{_infodir}/dir
>-  mv -f .%{_bindir}/install-info ./sbin
>-popd
>+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/texi2pdf.1
>+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_infodir}/dir
>+mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
> 
> rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd}
> 
>@@ -91,25 +83,25 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo
> rm -rf ${RPM_BUILD_ROOT}
> 
> %post
>-/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || :
>+/sbin/install-info %{_infodir}/texinfo %{_infodir}/dir || :
> 
> %preun
> if [ $1 = 0 ]; then
>-    /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || :
>+    /sbin/install-info --delete %{_infodir}/texinfo %{_infodir}/dir || :
> fi
> 
> %post -n info
>-/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir || :
>+/sbin/install-info %{_infodir}/info-stnd.info %{_infodir}/dir || :
> 
> %preun -n info
> if [ $1 = 0 ]; then
>-    /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir \
>+    /sbin/install-info --delete %{_infodir}/info-stnd.info %{_infodir}/dir \
> 	|| :
> fi
> 
> %files -f %{name}.lang
>-%defattr(-,root,root)
>-%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO
>+%defattr(-,root,root,-)
>+%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO COPYING
> %{_bindir}/makeinfo
> %{_datadir}/texinfo
> %{_infodir}/texinfo*
>@@ -117,7 +109,7 @@ fi
> %{_mandir}/man5/texinfo.5*
> 
> %files -n info
>-%defattr(-,root,root)
>+%defattr(-,root,root,-)
> %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
> %doc COPYING
> %{_bindir}/info

Actions: View | Diff

Attachments on bug 226488: 291429 | 292489 | 292880