rpms/texinfo/devel texinfo.spec,1.49,1.50
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Tue Jan 22 11:25:43 UTC 2008
Author: vcrhonek
Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227
Modified Files:
texinfo.spec
Log Message:
merge review fixes
Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- texinfo.spec 10 Dec 2007 14:56:42 -0000 1.49
+++ texinfo.spec 22 Jan 2008 11:25:03 -0000 1.50
@@ -2,7 +2,7 @@
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 @@
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
@@ -65,7 +61,6 @@
%patch2 -p1 -b .direntry
%build
-
%configure
make %{?_smp_mflags}
@@ -73,43 +68,44 @@
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}
+# Convert ChangeLog to UTF-8
+mv ChangeLog ChangeLog_iso
+/usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog_iso > ChangeLog
+rm -f ChangeLog_iso
+
%find_lang %name
%clean
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 +113,7 @@
%{_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
@@ -415,6 +411,7 @@
* Thu Mar 11 1999 Cristian Gafton <gafton at redhat.com>
- version 3.12f
- make /usr/info/dir to be a %%config(noreplace)
+
* Wed Nov 25 1998 Jeff Johnson <jbj at redhat.com>
- rebuild to fix docdir perms.
More information about the fedora-extras-commits
mailing list