rpms/gettext/devel gettext.spec,1.99,1.100
Jens Petersen
petersen at fedoraproject.org
Tue Sep 1 07:38:52 UTC 2009
- Previous message (by thread): rpms/maven-plugin-tools/devel maven-plugin-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Catalyst-Plugin-Session/devel .cvsignore, 1.3, 1.4 perl-Catalyst-Plugin-Session.spec, 1.7, 1.8 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986
Modified Files:
gettext.spec
Log Message:
- bring back autopoint requires cvs (#517361)
- require info rather than /sbin/install-info
- drop install_info and remove_install_info macros
Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gettext.spec 24 Jul 2009 23:54:47 -0000 1.99
+++ gettext.spec 1 Sep 2009 07:38:51 -0000 1.100
@@ -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(preun): /sbin/install-info
+Requires(post): 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 at 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 at lists.fedoraproject.org> - 0.17-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/maven-plugin-tools/devel maven-plugin-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-Catalyst-Plugin-Session/devel .cvsignore, 1.3, 1.4 perl-Catalyst-Plugin-Session.spec, 1.7, 1.8 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list