rel 8; drop cvs dependency from autopoint

Changed files:
    gettext-cvs.patch -> 1.2
    gettext.spec -> 1.166

diff --git a/gettext-cvs.patch b/gettext-cvs.patch
index c9e1263a153558ea676a5b597003eabf5647db48..b36fa1bb3414125b4d55a4e9ddd9b86c1b1b6416 100644 (file)
--- a/gettext-cvs.patch
+++ b/gettext-cvs.patch
@@ -1,16 +1,78 @@
---- gettext-0.17/./gettext-tools/misc/autopoint.in.org 2008-11-10 00:39:01.489132060 +0100
-+++ gettext-0.17/./gettext-tools/misc/autopoint.in     2008-11-10 00:41:40.679933768 +0100
-@@ -415,9 +415,12 @@
- unset CVSUMASK
- unset CVSWRAPPERS
+diff -urN gettext-0.17.org/gettext-tools/misc/autopoint.in gettext-0.17/gettext-tools/misc/autopoint.in
+--- gettext-0.17.org/gettext-tools/misc/autopoint.in   2007-11-07 03:53:58.000000000 +0100
++++ gettext-0.17/gettext-tools/misc/autopoint.in       2009-08-19 14:10:49.914980544 +0200
+@@ -339,8 +339,6 @@
+ # a severe restrictions, because most of the people who use autopoint are
+ # users of CVS.
+ #
+-# Check availability of the CVS program.
+-(cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"
  
-+cvsoptinit=""
-+cvs --version 2> /dev/null | grep -q "CVSNT" && cvsoptinit="-n"
-+
- # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
- # current directory.
+ # Check in which directory config.rpath, mkinstalldirs etc. belong.
+ auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
+@@ -381,17 +379,7 @@
+ # Set variables
+ # - cvs_dir         directory containing the temporary repository
+ # - work_dir        directory containing the temporary checkout
+-cvs_dir=tmpcvs$$
+ work_dir=tmpwrk$$
+-# Use an umask of 077, to avoid attacks that work by overwriting files in the
+-# "$CVSROOT"/CVSROOT directory.
+-(umask 077 && mkdir "$cvs_dir") || {
+-  if test -d "$cvs_dir"; then
+-    func_fatal_error "directory $cvs_dir already exists"
+-  else
+-    func_fatal_error "cannot create directory $cvs_dir"
+-  fi
+-}
+ mkdir "$work_dir" || {
+   if test -d "$work_dir"; then
+     func_fatal_error "directory $work_dir already exists"
+@@ -399,34 +387,13 @@
+     func_fatal_error "cannot create directory $work_dir"
+   fi
+ }
+-CVSROOT="$srcdir/$cvs_dir"
+-export CVSROOT
+-unset CVS_CLIENT_LOG
+-unset CVS_CLIENT_PORT
+-unset CVS_IGNORE_REMOTE_ROOT
+-unset CVS_PASSFILE
+-unset CVS_PASSWORD
+-unset CVS_RCMD_PORT
+-unset CVS_RSH
+-unset CVS_SERVER
+-unset CVS_SERVER_SLEEP
+-unset CVSIGNORE
+-unset CVSREAD
+-unset CVSUMASK
+-unset CVSWRAPPERS
+-
+-# Need to pass -d "$CVSROOT", because there may be a CVS directory in the
+-# current directory.
 -cvs -d "$CVSROOT" init
-+cvs -d "$CVSROOT" init $cvsoptinit
- gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
+-gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
  
  cd "$work_dir"
+ 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
+-if test `find archive -type f -print | wc -l` = 0; then
+-  cd ..
+-  rm -rf "$cvs_dir" "$work_dir"
++if test -f "$gettext_dir/archive-$cvsver.tar.gz"; then
++      tar xzf "$gettext_dir/archive-$cvsver.tar.gz"
++else
++  rm -rf "$work_dir"
+   func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
+ fi
+ cd ..
+@@ -489,7 +456,7 @@
+     fi
+   done
+   if test -n "$mismatch"; then
+-    rm -rf "$cvs_dir" "$work_dir"
++    rm -rf "$work_dir"
+     func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified. For your convenience, you find the local modifications in the file '$mismatchfile'."
+   fi
+   rm -rf "$tmp"

diff --git a/gettext.spec b/gettext.spec
index b72b962621e4ea2607c9d8299ef642633092f9a5..281b1f036e8aa9582db54cf39b6b3a87e0364b0f 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -38,7 +38,7 @@ Summary(tr.UTF-8):    Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext
 Version:       0.17
-Release:       7
+Release:       8
 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -54,6 +54,7 @@ Patch7:               %{name}-cvs.patch
 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.10
+BuildRequires: cvs-gnu-client
 %{?with_gcj:BuildRequires:     gcj >= 3.0}
 %{!?with_bootstrap:BuildRequires:      glib2-devel >= 2.0}
 %if %{with javac}
@@ -282,7 +283,6 @@ Summary(pl.UTF-8):  Zamiennik gettextize
 License:       GPL v3+
 Group:         Development/Tools
 Requires:      %{name}-devel >= 0.10.35
-Requires:      cvs-client
 
 %description autopoint
 The `autopoint' program copies standard gettext infrastructure files
@@ -324,6 +324,20 @@ GNU gettext dla C#.
 %patch7 -p1
 
 %build
+# make autopoint to use tar.gz archives instead of cvs repository
+install -d archive-cvs/{prepare,archive}
+tar xzf gettext-tools/misc/archive.tar.gz -C archive-cvs/prepare
+cvs -d$(pwd)/archive-cvs/prepare/archive init
+cd archive-cvs/archive
+cvs -Q -d$(pwd)/../prepare/archive -q co .
+for rev in $(cvs status -v | grep '(revision:' | awk ' { print $1 } ' | sort -u); do
+       cvs -Q up -d -r $rev
+       cd ..
+       tar czf archive-${rev}.tar.gz archive --exclude=CVS
+       cd archive
+done
+cd ../..
+
 %{__libtoolize}
 cd autoconf-lib-link
 %{__aclocal} -I m4 -I ../m4
@@ -384,6 +398,9 @@ mv -f $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin
 install gettext-tools/gnulib-lib/.libs/libgettextlib.a \
        gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
 
+install archive-cvs/archive-*.tar.gz $RPM_BUILD_ROOT%{_datadir}/gettext/archive
+rm $RPM_BUILD_ROOT%{_datadir}/gettext/archive.tar.gz
+
 rm -r $RPM_BUILD_ROOT%{_docdir}/gettext
 rm -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -517,7 +534,7 @@ rm -rf $RPM_BUILD_ROOT
 %files autopoint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/autopoint
-%{_datadir}/gettext/archive.tar.gz
+%{_datadir}/gettext/archive
 %{_mandir}/man1/autopoint.1*
 
 %if %{with dotnet}