- bring back autopoint requires cvs (#517361)

- require info rather than /sbin/install-info
- drop install_info and remove_install_info macros

gettext.spec

@@ -5,14 +5,12 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 BuildRequires: autoconf >= 2.5
 BuildRequires: automake
 BuildRequires: libtool, bison, gcc-c++
@@ -30,6 +28,10 @@ BuildRequires: zip, unzip
 # need expat for xgettext on glade
 Buildrequires: expat-devel
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# for autopoint:
+Requires: cvs
+Requires(post): info
+Requires(preun): info
 Patch5: gettext-0.17-open-args.patch
 Patch6: gettext-0.17-autopoint-CVS-441481.patch
 Patch7: gettext-0.17-rpathFix.patch
@@ -54,8 +56,8 @@ Group: Development/Tools
 License: LGPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/install-info
+Requires(post): info
-Requires(preun): /sbin/install-info
+Requires(preun): info
 
 
 %description devel
@@ -178,20 +180,15 @@ make check
 %endif
 
 
-%define install_info /sbin/install-info
-%define remove_install_info /sbin/install-info --delete
-
-
 %post
 /sbin/ldconfig
-%{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 
 
 %preun
 if [ "$1" = 0 ]; then
-    %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 fi
-exit 0
 
 
 %postun -p /sbin/ldconfig
@@ -199,12 +196,12 @@ exit 0
 
 %post devel
 /sbin/ldconfig
-%{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/autosprintf.info %{_infodir}/dir || :
 
 
 %preun devel
 if [ "$1" = 0 ]; then
-    %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/autosprintf.info %{_infodir}/dir || :
 fi
 
 
@@ -271,6 +268,11 @@ fi
 
 
 %changelog
+* Tue Sep  1 2009 Jens Petersen <petersen@redhat.com> - 0.17-15
+- bring back autopoint requires cvs (#517361)
+- requires info rather than /sbin/install-info
+- drop install_info and remove_install_info macros
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild