rpms/gettext/F-13 gettext.spec,1.105,1.106

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/gettext/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8747

Modified Files:
	gettext.spec 
Log Message:
- correct license tag from GPLv3 to GPLv3+
- no longer require cvs (#606746)
- disable dependency on git with bcond




Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-13/gettext.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gettext.spec	11 Jun 2010 05:49:00 -0000	1.105
+++ gettext.spec	23 Jun 2010 07:37:16 -0000	1.106
@@ -1,12 +1,13 @@
 %bcond_without jar
 %bcond_without java
 %bcond_without check
+%bcond_with git
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.1.1
-Release: 0.1%{?dist}
-License: GPLv3 and LGPLv2+
+Release: 1.1%{?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
@@ -28,10 +29,12 @@ BuildRequires: zip, unzip
 %endif
 # need expat for xgettext on glade
 Buildrequires: expat-devel
+%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
 
@@ -48,6 +51,17 @@ catalogs and is a powerful and simple me
 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
@@ -57,7 +71,6 @@ Requires: %{name}-libs = %{version}-%{re
 Requires(post): info
 Requires(preun): info
 
-
 %description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
@@ -93,6 +106,9 @@ export JAR=fastjar
 %else
     --disable-java --disable-native-java \
 %endif
+%if %{without git}
+    --disable-git \
+%endif
 %{nil}
 
 make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
@@ -260,6 +276,11 @@ fi
 
 
 %changelog
+* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-1.1
+- correct license tag from GPLv3 to GPLv3+
+- no longer require cvs (#606746)
+- disable dependency on git with bcond
+
 * Fri Jun 11 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-0.1
 - update to 0.18.1.1 release (#591044)
 - gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch