rpms/tla/F-7 tla-1.3.5-neon.patch, NONE, 1.1 tla-1.3.5-posix.patch, NONE, 1.1 tla-1.3.5-remove-invariant.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 tla.spec, 1.28, 1.29 tla-1.2pre0-posix.patch, 1.1, NONE tla-1.3.3-sysneon.patch, 1.1, NONE tla-remove-invariant.patch, 1.1, NONE

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/tla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20303/F-7

Modified Files:
	.cvsignore sources tla.spec 
Added Files:
	tla-1.3.5-neon.patch tla-1.3.5-posix.patch 
	tla-1.3.5-remove-invariant.patch 
Removed Files:
	tla-1.2pre0-posix.patch tla-1.3.3-sysneon.patch 
	tla-remove-invariant.patch 
Log Message:
Initial import into F-7.

 Modified Files:
 	F-7/.cvsignore F-7/sources F-7/tla.spec 
 Added Files:
 	F-7/tla-1.3.5-neon.patch F-7/tla-1.3.5-posix.patch 
 	F-7/tla-1.3.5-remove-invariant.patch 
 Removed Files:
 	F-7/tla-1.2pre0-posix.patch F-7/tla-1.3.3-sysneon.patch 
 	F-7/tla-remove-invariant.patch 


tla-1.3.5-neon.patch:

--- NEW FILE tla-1.3.5-neon.patch ---
diff -urNp tla-1.3.5.orig/src/tla/libarch/pfs-dav.c tla-1.3.5/src/tla/libarch/pfs-dav.c
--- tla-1.3.5.orig/src/tla/libarch/pfs-dav.c	2006-07-20 12:04:40.000000000 +0530
+++ tla-1.3.5/src/tla/libarch/pfs-dav.c	2007-11-10 17:31:15.000000000 +0530
@@ -21,14 +21,14 @@
 #include "tla/libfsutils/file-contents.h"
 #include "tla/libarch/archives.h"
 #include "tla/libarch/pfs-dav.h"
-#include "libneon/src/ne_session.h"
-#include "libneon/src/ne_basic.h"
-#include "libneon/src/ne_request.h"
-#include "libneon/src/ne_auth.h"
-#include "libneon/src/ne_props.h"
-#include "libneon/src/ne_uri.h"
-#include "libneon/src/ne_redirect.h"
-#include "libneon/src/ne_socket.h"
+#include <neon/ne_session.h>
+#include <neon/ne_basic.h>
+#include <neon/ne_request.h>
+#include <neon/ne_auth.h>
+#include <neon/ne_props.h>
+#include <neon/ne_uri.h>
+#include <neon/ne_redirect.h>
+#include <neon/ne_socket.h>
 
 
 
diff -urNp tla-1.3.5.orig/src/tla/PLUGIN/REQ tla-1.3.5/src/tla/PLUGIN/REQ
--- tla-1.3.5.orig/src/tla/PLUGIN/REQ	2006-07-20 12:04:40.000000000 +0530
+++ tla-1.3.5/src/tla/PLUGIN/REQ	2007-11-10 17:32:39.000000000 +0530
@@ -1,2 +1 @@
 hackerlab	tla
-libneon		tla
diff -urNp tla-1.3.5.orig/src/tla/tla/Makefile.in tla-1.3.5/src/tla/tla/Makefile.in
--- tla-1.3.5.orig/src/tla/tla/Makefile.in	2006-07-20 12:04:40.000000000 +0530
+++ tla-1.3.5/src/tla/tla/Makefile.in	2007-11-10 17:34:17.000000000 +0530
@@ -3,7 +3,7 @@ libs			:=	../libarch/libarch.a \
 				../libawk/libawk.a \
 				../libdate/libdate.a \
 				$(objroot)/hackerlab/libhackerlab/libhackerlab.a \
-				../../libneon/src/libneon.la \
+				-lneon \
 				-lm 
 
 mains			:=	tla.c
@@ -21,7 +21,7 @@ Programs: $(programs)
 endif
 
 $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out -l%, $(libs)))
-	$(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -L../../expat -o $@ $< $(thelib) $(libs)
+	$(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs)
 
 clean: clean-prog
 

tla-1.3.5-posix.patch:

--- NEW FILE tla-1.3.5-posix.patch ---
diff -urNp tla-1.3.5.orig/src/tla/tests/test-dir-regexps.sh tla-1.3.5/src/tla/tests/test-dir-regexps.sh
--- tla-1.3.5.orig/src/tla/tests/test-dir-regexps.sh	2006-07-20 12:04:40.000000000 +0530
+++ tla-1.3.5/src/tla/tests/test-dir-regexps.sh	2007-11-10 00:50:21.000000000 +0530
@@ -36,7 +36,7 @@ test "$(tla inventory -s)" = "attrapca"
 echo "unrecognized ^attrapca$" > .arch-inventory
 test "$(echo $(tla inventory -u))" = "@rapca attrapca"
 echo "source ^@.*$" > .arch-inventory
-test "$(echo $(tla inventory -s --all | head -4))" = \
+test "$(echo $(tla inventory -s --all | head -n 4))" = \
      ".arch-ids/.arch-inventory.id .arch-inventory @rapca attrapca"
 end_test
 

tla-1.3.5-remove-invariant.patch:

--- NEW FILE tla-1.3.5-remove-invariant.patch ---
diff -urNp tla-1.3.5.orig/src/hackerlab/tests/arrays-tests/unit-ar.c tla-1.3.5/src/hackerlab/tests/arrays-tests/unit-ar.c
--- tla-1.3.5.orig/src/hackerlab/tests/arrays-tests/unit-ar.c	2006-07-20 12:04:36.000000000 +0530
+++ tla-1.3.5/src/hackerlab/tests/arrays-tests/unit-ar.c	2007-11-11 22:13:48.000000000 +0530
@@ -50,7 +50,6 @@ static void
 check_array (size_t size, unsigned long * ar)
 {
   int x;
-  invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1)));
   invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar)));
   for (x = 0; x < size; ++x)
     invariant (ar[x] == HASH_INDEX (x));


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tla/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Feb 2006 17:19:52 -0000	1.10
+++ .cvsignore	17 Nov 2007 18:44:51 -0000	1.11
@@ -1,2 +1 @@
-tla-1.3.4.tar.gz
-tla-1.3.4.tar.gz.sig
+tla-1.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tla/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Feb 2006 17:19:52 -0000	1.10
+++ sources	17 Nov 2007 18:44:51 -0000	1.11
@@ -1,2 +1 @@
-9c6026bd37cab999368f8fa9c2fa7002  tla-1.3.4.tar.gz
-a325005cb525901d6964a093f4420946  tla-1.3.4.tar.gz.sig
+db31ee89bc4788eef1eba1cee6c176ef  tla-1.3.5.tar.gz


Index: tla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tla/F-7/tla.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tla.spec	28 Aug 2006 00:28:58 -0000	1.28
+++ tla.spec	17 Nov 2007 18:44:51 -0000	1.29
@@ -1,178 +1,112 @@
-Name:           tla
-Version:        1.3.4
-Release:        5%{?dist}
-Summary:        GNU arch revision control system
-
-Group:          Development/Tools
-License:        GPL
-URL:            http://www.gnu.org/software/gnu-arch/
-Source0:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
-# Patch0 from SuSE 9.1's tla-1.2-15
-Patch0:         %{name}-1.2pre0-posix.patch
-# Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4.
-Patch1:         %{name}-1.3.3-sysneon.patch
-Patch2:         %{name}-remove-invariant.patch
-Source2:        %{name}-generate-manpage.pl
+Summary:	A version control system
+Name:		tla
+Version:	1.3.5
+Release:	2%{?dist}
+License:	GPLv2+
+Group:		Development/Tools
+URL:		http://www.gnu.org/software/gnu-arch/
+Source0:	ftp://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz
+Source1:	%{name}-generate-manpage.pl
+
+Patch0:		%{name}-%{version}-neon.patch
+Patch1:		%{name}-%{version}-posix.patch
+Patch2:		%{name}-%{version}-remove-invariant.patch
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires:	diffutils
+Requires:	patch
+Requires:	tar
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  neon-devel, which
-Requires:       tar, diffutils, patch
+BuildRequires:	neon-devel
 
 %description
-GNU arch is a revision control system, similar in purpose to tools
-such as CVS, SCCS, and Subversion.  It is used to keep track of the
-changes made to a source tree and to help programmers combine and
-otherwise manipulate changes made by multiple people or at different
-times.  GNU arch has some features that make it particularly useful
-for public free software projects: it's easy to learn; it's
-inexpensive and easy to administer; it's a distributed system so
-there's no need to give write permission to every project participant;
-it has excellent support for the kinds of branching and merging that
-can make a free software project team shine.
+GNU Arch 1 (also known as tla) is a revision control system, similar in
+purpose to tools such as CVS, SCCS, and Subversion. It is used to keep track
+of the changes made to a source tree and to help programmers combine and
+otherwise manipulate changes made by multiple people or at different times.
+
+TLA is a punning acronym that stands for either "true love, always" and "three
+letter acronym".
 
 %prep
 %setup -q
-cd src
-%patch0 -p0
-cd ..
-rm -rf src/libneon
-rm -rf src/expat
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
+# Build against neon-devel.
+rm -rf ./src/libneon
+
+# Suppress rpmlint error.
+iconv --from-code ISO8859-1 --to-code UTF-8 ./src/tla/AUTHORS \
+  --output AUTHORS.utf-8 && mv AUTHORS.utf-8 ./src/tla/AUTHORS
+iconv --from-code ISO8859-1 --to-code UTF-8 ./src/tla/README \
+  --output README.utf-8 && mv README.utf-8 ./src/tla/README
+
 %build
-mkdir src/=build
-cd src/=build
-../configure \
+# configure script and Makefiles are not generated by Autoconf/Automake.
+mkdir -p ./build
+pushd ./build
+  ../src/configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
-make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
+  # Parallel make does not work.
+  make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
-# put the documentation in a reasonable spot and only include html/css files
-mkdir -p docs-tla/html
-(cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
-(cd docs-tla/html; tar -xf-)
-cd ../..
+  # Use only HTML and CSS files for documentation.
+  # To be later listed against %doc.
+  mkdir -p ./docs-tla
+  pushd ./docs-tla
+  find ../../src/docs-tla -name "*.css" -o -name "*.html" \
+  | xargs tar --atime-preserve -cf- \
+  | tar --atime-preserve -xf-
+  popd
+popd
+
+# man page
+mkdir -p ./debian/tmp
+PATH="`pwd`/build/tla/tla:$PATH" perl %{SOURCE1} tla.1
 
-mkdir -p debian/tmp
-PATH="`pwd`/src/=build/tla/tla:$PATH" perl %{SOURCE2} tla.1
+%check
+pushd ./build
+  make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C src/=build install \
-    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 
-%check
-make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+pushd ./build
+  # Makefiles use destdir instead of DESTDIR.
+  make install CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" \
+  destdir=$RPM_BUILD_ROOT
+popd
+
+# man page
+install -p -m644 ./debian/tmp/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc src/COPYING src/tla/ChangeLog src/=build/docs-tla/html/
+%doc build/docs-tla/src/docs-tla
+%doc src/tla/AUTHORS
+%doc src/tla/README
 %{_bindir}/make-links
+%{_bindir}/%{name}
 %{_bindir}/remove-links
-%{_bindir}/tla
-%{_mandir}/man1/tla.1*
+%{_mandir}/man1/%{name}.1.gz
 
 %changelog
-* Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-5
-- Bump and rebuild for FE6
-
-* Fri Mar 17 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-4
-- Add patch to remove failing invariant (bug 182742)
-
-* Fri Mar  3 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-3
-- Remove ppc alignment patch now that glibc is fixed
-
-* Mon Feb 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-2
-- Add patch to allow building on PPC for now
-
-* Fri Feb 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.4-1
-- 1.3.4, most of Debian patch applied upstream.
-- Update summary and description.
-
-* Fri Feb 24 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.3-6
-- Add excludearch for ppc due to bug 182742
-
-* Wed Feb 22 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.3-5
-- Bump and rebuild for FE5
-
-* Wed Feb  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-4
-- Rebuild for new neon.
-
-* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-3
-- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
-  man page and hopefully fixes ppc segfaults etc.
-- Specfile cleanups.
-
-* Tue Dec 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-2
-- Rebuild against new OpenSSL.
-
-* Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> - 1.3.3-1
-- Update to new upstream version
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.2
-- rebuild on all arches
-
-* Mon May 09 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.2-5
-- Remove hard-coded disttag
-
-* Wed May 04 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.2-4
-- Update disttag to new recommendations
-
-* Tue May 03 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.2-3
-- Add disttag
-- Fix documentation packaging
-
-* Tue May 03 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.2-2
-- Increment release for devel
-
-* Tue May 03 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.2-1
-- Update to upstream 1.3.2
-- Update sysneon patch
-- Remove gcc4 patch as it was moved upstream
-- Remove broken texinfo patches
-- Remove non-existant texinfo documentation
-- Fix building and installing HTML documentation
-
-* Fri Apr 22 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-5.fix.1
-- Increment EVR for devel package
-
-* Mon Mar 28 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-4.fix.1
-- Update to 1.3.1-fix-1 (hopefully fix PPC segfault)
-
-* Wed Mar 23 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-3
-- gcc4 build fixes
-
-* Tue Mar 22 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-2
-- Add BuildRequires which to fix building under mach
-
-* Mon Mar 21 2005 Shahms E. King <shahms at shahms.com> - 0:1.3.1-1
-- Update to 1.3.1.
-
-* Sun Jan 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.3-1
-- Update to 1.3.
-
-* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.1-0.fdr.1
-- Update to 1.2.1.
-
-* Wed Jul 28 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2-0.fdr.3
-- Apply patches and ideas from ALT Linux's tla-1.2-alt6 and SuSE's tla-1.2-15:
-  Use system libneon, fix for sftp fd leak, install info documentation.
-- Run test suite during build.
-- Install more documentation.
-
-* Fri Jul 23 2004 Michel Salim <michel.salim[AT]gmail.com> - 0:1.2-0.fdr.2
-- Temporarily disable parallel build on SMP systems; Makefile not SMP-safe.
-  Please report if situation changes
-
-* Fri Jun 18 2004 Kristof Vansant <de_lupus at pandora.be> - 0:1.2-0.fdr.1
-- Updated to 1.2
-
-* Sun Feb 08 2004 Michel Alexandre Salim <salimma[AT]users.sf.net> - 0:1.1-0.fdr.1
-- Initial RPM release.
+* Fri Nov 16 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.3.5-2
+- Changed value of License to GPLv2+.
 
+* Sat Nov 10 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.3.5-1
+- Initial build. Imported SPEC from Rawhide.
+- Added online manual page generator and patches to build against neon-devel
+  from Debian.
+- Added patch to test-dir-regexps.sh from SuSE.
+- Removed call to invariant to prevent failure on ppc. Closes Red Hat Bugzilla
+  bug #182742.
+- Disabled parallel make to prevent failure.


--- tla-1.2pre0-posix.patch DELETED ---


--- tla-1.3.3-sysneon.patch DELETED ---


--- tla-remove-invariant.patch DELETED ---