rpms/gettext/devel gettext-0.17-autopoint-CVS-441481.patch, NONE, 1.1 gettext.spec, 1.85, 1.86

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9359

Modified Files:
	gettext.spec 
Added Files:
	gettext-0.17-autopoint-CVS-441481.patch 
Log Message:
fix autopoint messing up CVS files (#441481)
- reported by Richard W.M. Jones
- patch by Jim Meyering and Bruno Haible


gettext-0.17-autopoint-CVS-441481.patch:

--- NEW FILE gettext-0.17-autopoint-CVS-441481.patch ---
2008-04-20  Bruno Haible  <bruno at clisp.org>

	* autopoint.in: Check that really all CVS directories are removed.
	Reported by Jim Meyering <jim at meyering.net>.

*** gettext-tools/misc/autopoint.in        18 Jan 2008 23:30:16 -0000      1.37
--- gettext-tools/misc/autopoint.in        20 Apr 2008 06:06:07 -0000
***************
*** 426,431 ****
--- 426,438 ----
  cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
  (cvs checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
  find archive -name CVS -type d -print | xargs rm -rf
+ # Check that really all CVS directories are gone, otherwise we would overwrite
+ # the contents of the user's CVS directories.
+ if test `find archive -name CVS -type d -print | wc -l` != 0; then
+   cd ..
+   rm -rf "$cvs_dir" "$work_dir"
+   func_fatal_error "failed to remove all CVS subdirectories"
+ fi
  if test `find archive -type f -print | wc -l` = 0; then
    cd ..
    rm -rf "$cvs_dir" "$work_dir"



Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gettext.spec	18 Feb 2008 00:52:51 -0000	1.85
+++ gettext.spec	24 Apr 2008 05:29:42 -0000	1.86
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -26,6 +26,7 @@
 %endif
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch5: gettext-0.17-open-args.patch
+Patch6: gettext-0.17-autopoint-CVS-441481.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -69,6 +70,7 @@
 %prep
 %setup -q
 %patch5 -p0 -b .5-open-args~
+%patch6 -p0 -b .5-open-args~
 
 
 %build
@@ -232,6 +234,9 @@
 
 
 %changelog
+* Thu Apr 24 2008 Jens Petersen <petersen at redhat.com> - 0.17-5
+- fix autopoint messing up CVS files with upstream patch (#441481)
+
 * Mon Feb 18 2008 Jens Petersen <petersen at redhat.com> - 0.17-4
 - if %%buildjar is off make sure libintl.jar does not get installed (#433210)