rpms/tla/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tla-sysneon.patch, 1.2, 1.3 tla.spec, 1.11, 1.12 tla-1.2-alt-texinfo.patch, 1.1, NONE tla-1.2-texi.diff, 1.1, NONE tla-1.3.1-gcc4.patch, 1.1, NONE
Shahms King (shahms)
fedora-extras-commits at redhat.com
Tue May 3 21:11:32 UTC 2005
Author: shahms
Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13719
Modified Files:
.cvsignore sources tla-sysneon.patch tla.spec
Removed Files:
tla-1.2-alt-texinfo.patch tla-1.2-texi.diff
tla-1.3.1-gcc4.patch
Log Message:
update to 1.3.2 (with requisite build fixes)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 28 Mar 2005 16:27:43 -0000 1.6
+++ .cvsignore 3 May 2005 21:11:30 -0000 1.7
@@ -1,2 +1,2 @@
-tla-1.3.1-fix-1.tar.gz
-tla-1.3.1-fix-1.tar.gz.sig
+tla-1.3.2.tar.gz
+tla-1.3.2.tar.gz.sig
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 28 Mar 2005 16:27:43 -0000 1.6
+++ sources 3 May 2005 21:11:30 -0000 1.7
@@ -1,2 +1,2 @@
-bab3b300176c5d038e190602eac40e86 tla-1.3.1-fix-1.tar.gz
-3c24ed067763fec10a3bdb22f8a78665 tla-1.3.1-fix-1.tar.gz.sig
+6dde0631a56b389768172cf089bbdc3a tla-1.3.2.tar.gz
+f371db1c3cf58ffcbaa87d941b912838 tla-1.3.2.tar.gz.sig
tla-sysneon.patch:
Index: tla-sysneon.patch
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla-sysneon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tla-sysneon.patch 21 Mar 2005 20:01:07 -0000 1.2
+++ tla-sysneon.patch 3 May 2005 21:11:30 -0000 1.3
@@ -1,6 +1,6 @@
-diff -Naru tla-1.3.orig/src/tla/libarch/pfs-dav.c tla-1.3/src/tla/libarch/pfs-dav.c
---- tla-1.3.orig/src/tla/libarch/pfs-dav.c 2004-12-23 06:30:26.000000000 +0200
-+++ tla-1.3/src/tla/libarch/pfs-dav.c 2005-01-30 11:05:37.203806225 +0200
+diff -ur tla-1.3.2-orig/src/tla/libarch/pfs-dav.c tla-1.3.2/src/tla/libarch/pfs-dav.c
+--- tla-1.3.2-orig/src/tla/libarch/pfs-dav.c 2005-05-02 16:47:07.000000000 -0700
++++ tla-1.3.2/src/tla/libarch/pfs-dav.c 2005-05-03 10:45:32.000000000 -0700
@@ -21,14 +21,14 @@
#include "tla/libfsutils/file-contents.h"
#include "tla/libarch/archives.h"
@@ -13,26 +13,41 @@
-#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>
++#include <ne_session.h>
++#include <ne_basic.h>
++#include <ne_request.h>
++#include <ne_auth.h>
++#include <ne_props.h>
++#include <ne_uri.h>
++#include <ne_redirect.h>
++#include <ne_socket.h>
-diff -Naru tla-1.3.orig/src/tla/tla/Makefile.in tla-1.3/src/tla/tla/Makefile.in
---- tla-1.3.orig/src/tla/tla/Makefile.in 2004-12-23 06:30:26.000000000 +0200
-+++ tla-1.3/src/tla/tla/Makefile.in 2005-01-30 11:06:40.201846088 +0200
+diff -ur tla-1.3.2-orig/src/tla/PLUGIN/REQ tla-1.3.2/src/tla/PLUGIN/REQ
+--- tla-1.3.2-orig/src/tla/PLUGIN/REQ 2005-05-02 16:47:05.000000000 -0700
++++ tla-1.3.2/src/tla/PLUGIN/REQ 2005-05-03 10:45:32.000000000 -0700
+@@ -1,2 +1 @@
+ hackerlab tla
+-libneon tla
+diff -ur tla-1.3.2-orig/src/tla/tla/Makefile.in tla-1.3.2/src/tla/tla/Makefile.in
+--- tla-1.3.2-orig/src/tla/tla/Makefile.in 2005-05-02 16:47:09.000000000 -0700
++++ tla-1.3.2/src/tla/tla/Makefile.in 2005-05-03 10:45:45.000000000 -0700
@@ -3,7 +3,7 @@
../libawk/libawk.a \
../libdate/libdate.a \
$(objroot)/hackerlab/libhackerlab/libhackerlab.a \
- ../../libneon/src/libneon.la \
+ -lneon \
- -lm
+ -lm
mains := tla.c
+@@ -21,7 +21,7 @@
+ 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)
++ $(SHELL) libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs)
+
+ clean: clean-prog
+
Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tla.spec 22 Apr 2005 15:47:45 -0000 1.11
+++ tla.spec 3 May 2005 21:11:30 -0000 1.12
@@ -1,27 +1,21 @@
Name: tla
-Version: 1.3.1
-Release: 5.fix.1
+Version: 1.3.2
+Release: 2
Summary: The Low-Budget 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/tla-1.3.1-fix-1.tar.gz
-Source1: http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.1-fix-1.tar.gz.sig
+Source0: http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.2.tar.gz
+Source1: http://ftp.gnu.org/gnu/gnu-arch/tla-1.3.2.tar.gz.sig
# Patch0 from SuSE 9.1's tla-1.2-15
Patch0: tla-1.2pre0-posix.patch
-# Patch1,3 from ALT Linux's tla-1.2-alt6
-Patch1: tla-1.2-texi.diff
-Patch2: tla-sysneon.patch
-Patch3: tla-1.2-alt-texinfo.patch
-Patch4: tla-1.3.1-gcc4.patch
+Patch1: tla-sysneon.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: texinfo, neon-devel, which
+BuildRequires: neon-devel, which
Requires: tar, diffutils, patch
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
%description
Arch is a really nifty revision control system. It's "whole-tree changeset
@@ -33,69 +27,57 @@
%prep
-%setup -q -n tla-1.3.1-fix-1
+%setup -q
cd src
%patch0 -p0
cd ..
+rm -rf src/libneon
+rm -rf src/expat
%patch1 -p1
-rm -rf src/tla/libneon
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
%build
mkdir src/=build
cd src/=build
-export CFLAGS=$RPM_OPT_FLAGS
+#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
../configure \
--prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
-make # %{?_smp_mflags} # 1.[23] is not parallel build clean
-cd ../docs-tla/texi
-makeinfo arch.texi
-cd ../..
-
+make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
+mkdir -p docs-tla/html
+cp -a ../docs-tla docs-tla/html
+find docs-tla/html -not -name \*.css -not -name \*.html -exec rm {} \;
%install
rm -rf $RPM_BUILD_ROOT
cd src/=build
-make install destdir=$RPM_BUILD_ROOT
-cd ../..
-rm -rf src/docs-tla/html/.arch-ids
-ln -s arch.html src/docs-tla/html/index.html
-install -Dpm 644 \
- src/docs-tla/texi/arch.info $RPM_BUILD_ROOT%{_infodir}/arch.info
-
+make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
%check || :
cd src/=build
-make test
+make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
%clean
rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/install-info %{_infodir}/arch.info %{_infodir}/dir 2>/dev/null || :
-
-%preun
-if [ $1 -eq 0 ] ; then
- /sbin/install-info --delete %{_infodir}/arch.info \
- %{_infodir}/dir 2>/dev/null || :
-fi
-
-
%files
%defattr(-,root,root,-)
-%doc src/COPYING src/tla/ChangeLog src/docs-tla/HOWTO.crypto src/docs-tla/html
+%doc src/COPYING src/tla/ChangeLog src/=build/docs-tla/html
%{_bindir}/make-links
%{_bindir}/remove-links
%{_bindir}/tla
-%{_infodir}/arch.info*
-
%changelog
+* 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
--- tla-1.2-alt-texinfo.patch DELETED ---
--- tla-1.2-texi.diff DELETED ---
--- tla-1.3.1-gcc4.patch DELETED ---
More information about the fedora-extras-commits
mailing list