- correct license tag from GPLv3 to GPLv3+

- subpackage autopoint which requires git (#574031)
- no longer require cvs (#606746)
- add bcond for git

gettext.spec

@@ -1,12 +1,13 @@
 %bcond_with jar
 %bcond_with java
 %bcond_without check
+%bcond_without git
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.1.1
-Release: 1%{?dist}
-License: GPLv3 and LGPLv2+
+Release: 2%{?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
@@ -30,11 +31,12 @@ BuildRequires: zip, unzip
 Buildrequires: expat-devel
 # for po-mode.el
 BuildRequires: emacs
+%if %{with git}
+# for autopoint:
 BuildRequires: git
+%endif
 BuildRequires: chrpath
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-# for autopoint:
-Requires: cvs
 Requires(post): info
 Requires(preun): info
 
@@ -51,6 +53,17 @@ catalogs and is a powerful and simple method for internationalizing
 programs.
 
 
+%package autopoint
+Summary: gettext autopoint tool
+Group: Development/Tools
+License: GPLv3+
+BuildArch: noarch
+Requires: git
+
+%description autopoint
+Autopoint is a utility to setup standard gettext files in a source tree.
+
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Tools
@@ -60,7 +73,6 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires(post): info
 Requires(preun): info
 
-
 %description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
@@ -76,6 +88,7 @@ License: LGPLv2+
 %description libs
 This package contains libraries used internationalization support.
 
+
 %package -n emacs-%{name}
 Summary: Support for editing po files within GNU Emacs
 Group: Applications/Editors
@@ -87,6 +100,7 @@ Requires: emacs(bin) >= %{_emacs_version}
 %description -n emacs-%{name}
 This package provides a major mode for editing po files within GNU Emacs.
 
+
 %package -n emacs-%{name}-el
 Summary: Elisp source files for editing po files within GNU Emacs
 Group: Applications/Editors
@@ -117,7 +131,10 @@ export JAR=fastjar
 %else
     --disable-java --disable-native-java \
 %endif
-    --enable-git
+%if %{without git}
+    --disable-git \
+%endif
+%{nil}
 
 make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
 
@@ -240,19 +257,25 @@ fi
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
 /bin/*
+%exclude %{_bindir}/autopoint
 %{_bindir}/*
 %{_infodir}/gettext*
+%exclude %{_mandir}/man1/autopoint.1*
 %{_mandir}/man1/*
 %{_libdir}/%{name}
 %if %{with java}
 %exclude %{_libdir}/%{name}/gnu.gettext.*
 %endif
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/archive.*.tar.gz
 %{_datadir}/%{name}/intl
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
 
+%files autopoint
+%{_bindir}/autopoint
+%{_datadir}/%{name}/archive.*.tar.gz
+%{_mandir}/man1/autopoint.1*
+
 %files devel
 %defattr(-,root,root,-)
 %doc gettext-runtime/man/*.3.html ChangeLog
@@ -297,6 +320,12 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Wed Jun 23 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-2
+- correct license tag from GPLv3 to GPLv3+
+- subpackage autopoint which requires git (#574031)
+- no longer require cvs (#606746)
+- add bcond for git
+
 * Fri May 21 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-1
 - update to 0.18.1.1 release (#591044)
 - gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch